summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmipathi <lakshmipathi@gluster.com>2011-04-08 18:14:41 +0000
committerVijay Bellur <vijay@gluster.com>2011-04-08 03:35:35 -0700
commit7b368061eaf15cf8b6e8adc3506b5baabdc466e8 (patch)
tree43f195551cba2d8a3b885c2fb347a5d1f6e215fa
parentb1e0fa2a2313cc7794bf4c459c891701dde9f2e0 (diff)
preserve symlink during rpm upgrade and remove gsync referencesv3.1.4qa3v3.1.4
Thanks to Joe Julian <joe@julianfamily.org> for the patch. Signed-off-by: Lakshmipathi.G <lakshmipathi@gluster.com> Signed-off-by: Vijay Bellur <vijay@gluster.com> BUG: 2279 (rpm spec file changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2279
-rw-r--r--glusterfs.spec.in19
1 files changed, 9 insertions, 10 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index d4dedbd..6fffc02 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -2,7 +2,7 @@
# a descriptive suffix to identify who owns or what the change represents
# e.g. release_version 2.MSW
%define release 1%{?dist}
-%define _libexecdir %{_prefix}/local/libexec
+#%define _libexecdir %{_prefix}/local/libexec
# if you wish to compile an rpm without rdma support, compile like this...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -115,6 +115,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
+%{__mkdir_p} %{buildroot}/usr/sbin
+%{__ln_s} ../..%{_sbindir}/glusterd %{buildroot}/usr/sbin/glusterd
+%{__ln_s} ../..%{_sbindir}/glusterfsd %{buildroot}/usr/sbin/glusterfsd
+%{__ln_s} ../..%{_sbindir}/gluster %{buildroot}/usr/sbin/gluster
+%{__ln_s} ../..%{_sbindir}/glusterfs %{buildroot}/usr/sbin/glusterfs
%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs
%{__mkdir_p} %{buildroot}/var/log/glusterfs
%{__install} -p -m 0644 libglusterfs/src/*.h \
@@ -131,13 +136,6 @@ find %{buildroot}%{_libdir} -name '*.a' | xargs rm -f
/sbin/ldconfig
/sbin/chkconfig --add glusterd
-#creat symlinks
-rm -rf /usr/sbin/glusterd /usr/sbin/glusterfsd /usr/sbin/glusterfs /usr/sbin/gluster
-
-ln -s %{_sbindir}/glusterd /usr/sbin/glusterd
-ln -s %{_sbindir}/glusterfsd /usr/sbin/glusterfsd
-ln -s %{_sbindir}/gluster /usr/sbin/gluster
-ln -s %{_sbindir}/glusterfs /usr/sbin/glusterfs
#update /etc/ld.so.conf.d
echo "%{_prefix}/lib64" > /etc/ld.so.conf.d/glusterfs.conf
@@ -169,6 +167,7 @@ fi
%{_sbindir}/glusterfs*
%{_sbindir}/gluster
%{_sbindir}/glusterd
+/usr/sbin
%{_mandir}/man8/*glusterfs.8*
%{_mandir}/man8/*glusterfsd.8*
%{_mandir}/man8/*gluster.8*
@@ -183,8 +182,8 @@ fi
%{_includedir}/glusterfs
%exclude %{_includedir}/glusterfs/y.tab.h
%{_libdir}/*.so
-%{_libexecdir}/gsyncd
-%{_libexecdir}/python/syncdaemon/*
+#%{_libexecdir}/gsyncd
+#%{_libexecdir}/python/syncdaemon/*
%if 0%{!?_without_rdma:1}
%files rdma