summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2012-02-22 16:08:26 +0530
committerVijay Bellur <vijay@gluster.com>2012-02-22 23:18:04 -0800
commit52904f0d416aedf61fcebe2e5051bfa92999c6e4 (patch)
tree9c44dea2a56dc1c1679d4a803968f81130741f2d
parent4ac06a16999bde2f9860f6a8713e7f2544b44f9a (diff)
build: Changes to specfile for correctness and package relevance.
- Removes a stale dependency of glusterfs-client on glusterfs-core - Server specific shared libraries included in glusterfs-server package. Change-Id: I852304e6351a9a7864b2049f603e11f6a5601ffb BUG: 764702 Signed-off-by: Vijay Bellur <vijay@gluster.com> Reviewed-on: http://review.gluster.com/2797 Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--glusterfs.spec.in19
1 files changed, 13 insertions, 6 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 0f4fe8b64..ef1178fbd 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
%global release 1%{?dist}
-%global _sharedstatedir %{_prefix}/var/lib
+%global _sharedstatedir /var/lib
# if you wish to compile an rpm without rdma support, compile like this...
@@ -46,7 +46,7 @@ Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
-BuildRequires: bison flex
+BuildRequires: bison flex
BuildRequires: gcc make automake libtool
BuildRequires: ncurses-devel readline-devel
BuildRequires: python-ctypes
@@ -117,9 +117,8 @@ This package provides support to geo-replication.
%package fuse
Summary: GlusterFS Fuse client
Group: Applications/File
-BuildRequires: fuse-devel
-Requires: glusterfs-core >= %{version}-%{release}
+Requires: %{name} >= %{version}-%{release}
Obsoletes: %{name}-client < %{version}-%{release}
Provides: %{name}-client = %{version}-%{release}
@@ -246,6 +245,10 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
%exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
%endif
%exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
+%exclude %{_libdir}/glusterfs/%{version}/xlator/storage*
+%exclude %{_libdir}/glusterfs/%{version}/xlator/features/posix*
+%exclude %{_libdir}/glusterfs/%{version}/xlator/mgmt*
+%exclude %{_libdir}/glusterfs/%{version}/xlator/nfs*
%if 0%{!?_without_rdma:1}
%files rdma
@@ -289,8 +292,8 @@ fi
if [ -d /var/lib/glusterd/vols ]; then
#for each dir under vols, backup non-fuse .vol files as .Vol.old
for file in `find /var/lib/glusterd/vols -type f ! -name *-fuse.vol `; do
- grep ".vol" $file &> /dev/null && fname=`basename $file .vol` && dname=`dirname $file` && cp $file $dname/$fname.Vol.old
- done
+ grep ".vol" $file &> /dev/null && fname=`basename $file .vol` && dname=`dirname $file` && cp $file $dname/$fname.Vol.old
+ done
fi
pidof -c -o %PPID -x glusterd &> /dev/null
@@ -332,6 +335,10 @@ fi
%{_sysconfdir}/init.d/glusterd
%{_sbindir}/gluster
%{_sbindir}/glusterd
+%{_libdir}/glusterfs/%{version}/xlator/storage*
+%{_libdir}/glusterfs/%{version}/xlator/features/posix*
+%{_libdir}/glusterfs/%{version}/xlator/mgmt*
+%{_libdir}/glusterfs/%{version}/xlator/nfs*
%files devel
%defattr(-,root,root,-)