From 38383c801097b29205665d46e9a02d28d7139a2b Mon Sep 17 00:00:00 2001 From: pmmccorm Date: Fri, 22 Nov 2013 12:31:34 -0800 Subject: [PATCH] Rename back to dapl, small fixes for spec file --- Makefile.am | 12 ++++++------ configure.in | 6 +++--- intel-mic-ofed-dapl.spec.in => dapl.spec.in | 8 ++++++-- 3 files changed, 15 insertions(+), 11 deletions(-) rename intel-mic-ofed-dapl.spec.in => dapl.spec.in (98%) diff --git a/Makefile.am b/Makefile.am index e083013..11f5b4e 100755 --- a/Makefile.am +++ b/Makefile.am @@ -717,7 +717,7 @@ EXTRA_DIST = dat/common/dat_dictionary.h \ LICENSE3.txt \ doc/dat.conf \ doc/mpxyd.conf \ - intel-mic-ofed-dapl.spec.in \ + dapl.spec.in \ mpxyd.init.in \ $(man_MANS) \ test/dapltest/include/dapl_bpool.h \ @@ -758,17 +758,17 @@ install-exec-hook: install -D -m 755 mpxyd.init $(DESTDIR)$(sysconfdir)/init.d/mpxyd; endif -dist-hook: intel-mic-ofed-dapl.spec - cp intel-mic-ofed-dapl.spec $(distdir)/ +dist-hook: dapl.spec + cp dapl.spec $(distdir)/ -rpmcheck: intel-mic-ofed-dapl.spec dist +rpmcheck: dapl.spec dist mkdir -p rpmbuild/{SOURCES,BUILD,RPMS,SPECS,BUILDROOT} cp $(distdir).tar.gz rpmbuild/SOURCES srcrpms: rpmcheck - rpmbuild -bs --define "_topdir ${PWD}/rpmbuild" intel-mic-ofed-dapl.spec + rpmbuild -bs --define "_topdir ${PWD}/rpmbuild" dapl.spec rpms: rpmcheck - rpmbuild -ba --define "_topdir ${PWD}/rpmbuild" intel-mic-ofed-dapl.spec + rpmbuild -ba --define "_topdir ${PWD}/rpmbuild" dapl.spec SUBDIRS = . test/dtest test/dapltest diff --git a/configure.in b/configure.in index e596db7..c1a4ce6 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(intel-mic-ofed-dapl, 2.0.36.12, linux-rdma@vger.kernel.org) +AC_INIT(dapl, 2.0.36.12, linux-rdma@vger.kernel.org) AC_CONFIG_SRCDIR([dat/udat/udat.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(intel-mic-ofed-dapl, 2.0.36.12) +AM_INIT_AUTOMAKE(dapl, 2.0.36.12) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_PROG_LIBTOOL @@ -199,5 +199,5 @@ AC_CACHE_CHECK(Check for SUSE_11 system, ac_cv_suse11, fi) AM_CONDITIONAL(OS_SUSE11, test "$ac_cv_suse11" = "yes") -AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile intel-mic-ofed-dapl.spec mpxyd.init]) +AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile dapl.spec mpxyd.init]) AC_OUTPUT diff --git a/intel-mic-ofed-dapl.spec.in b/dapl.spec.in similarity index 98% rename from intel-mic-ofed-dapl.spec.in rename to dapl.spec.in index 498f196..cc6782d 100644 --- a/intel-mic-ofed-dapl.spec.in +++ b/dapl.spec.in @@ -39,7 +39,7 @@ %define debug_package %{nil} -Name: intel-mic-ofed-dapl +Name: dapl Version: 2.0.36.12 Release: 1%{?dist} Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs, proxy daemon for offloading RDMA @@ -48,7 +48,7 @@ Group: System Environment/Libraries License: Dual GPL/BSD/CPL Url: http://openfabrics.org/ Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRoot: %{_topdir}/BUILDROOT Obsoletes: dapl Conflicts: dapl Requires(post): /sbin/ldconfig @@ -118,10 +118,14 @@ cp %{_sysconfdir}/dat.conf /tmp/%{version}-dat.conf if [ $1 -gt 1 ]; then /sbin/chkconfig --add mpxyd &> /dev/null || true + service mpxyd start +elif [ $1 -gt 2 ]; then + service mpxyd restart fi %preun /sbin/chkconfig --del mpxyd &> /dev/null || true +service mpxyd stop %postun /sbin/ldconfig -- 2.41.0