SPECS: glusterfs.spec - seding -avoidversion -> -avoid-version, killed no l...

[matkor]

Author: matkor                       Date: Tue Feb  3 15:59:35 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- seding -avoidversion -> -avoid-version, killed no longer needed patches. 

---- Files affected:
SPECS:
   glusterfs.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/glusterfs.spec
diff -u SPECS/glusterfs.spec:1.25 SPECS/glusterfs.spec:1.26
--- SPECS/glusterfs.spec:1.25	Tue Feb  3 15:39:45 2009
+++ SPECS/glusterfs.spec	Tue Feb  3 16:59:29 2009
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
 # TODO: Decide what to do with -static
 #       Obsolete it, fix build ?
-# TODO: Fix building xlators/performance/booster/glusterfs-booster.so
-#       Now it builds as executable so can't be dlopened later ...
-# Conditional build:
+# TODO: Conditional builds + packages for:
+# Berkeley-DB        : yes
+# mod_glusterfs      : yes (2.2)
 %bcond_without	ibverbs		# ib-verbs transport
 #
 Summary:	Clustered File Storage that can scale to peta bytes
@@ -20,8 +20,6 @@
 Source0:	http://ftp.zresearch.com/pub/gluster/glusterfs/2.0/%{version}/%{name}-%{_version}.tar.gz
 # Source0-md5:	6f6943fbb958c3f386ce3f152cf7ccdd
 Source1:	glusterfsd.init
-# Patch0:         %{name}-link_fix.patch
-# Patch1:         %{name}-open_fix.patch
 URL:		http://gluster.org/glusterfs.php
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -146,8 +144,7 @@
 
 %prep
 %setup -q -n %{name}-%{_version}
-#%%patch0 -p1
-#%%patch1 -p1
+%{__sed} -i -e 's|-avoidversion|-avoid-version|g'  */*/*/Makefile.am  */*/*/*/Makefile.am
 
 cp -l doc/examples/README README.examples
 
@@ -191,46 +188,39 @@
 %dir %{_libdir}/glusterfs/%{_version}
 %dir %{_libdir}/glusterfs/%{_version}/auth
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/auth/addr.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/auth/addr.so.*.*.*
-# %attr(755,root,root) %{_libdir}/glusterfs/%{_version}/auth/login.so*
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/auth/login.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/auth/login.so.*.*.*
 
 %dir %{_libdir}/glusterfs/%{_version}/scheduler
 ## %attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/{alu,nufa,random,rr,switch}.so*
 
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/scheduler/alu.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/alu.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/scheduler/nufa.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/nufa.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/scheduler/random.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/random.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/scheduler/rr.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/rr.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/glusterfs/%{_version}/scheduler/switch.so
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/scheduler/switch.so.*.*.*
 
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/transport/ib-verbs.so*
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/transport/socket.so*
+%dir %{_libdir}/glusterfs/%{_version}/transport
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/transport/ib-verbs.so
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/transport/socket.so
 
 %dir %{_libdir}/glusterfs/%{_version}/xlator
 %dir %{_libdir}/glusterfs/%{_version}/xlator/cluster
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/cluster/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/cluster/*.so
 
 %dir %{_libdir}/glusterfs/%{_version}/xlator/debug
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/debug/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/debug/*.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/encryption
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/encryption/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/encryption/*.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/features
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/features/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/features/*.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/mount
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/mount/fuse.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/mount/fuse.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/performance
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/performance/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/performance/*.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/protocol
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/protocol/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/protocol/*.so
 %dir %{_libdir}/glusterfs/%{_version}/xlator/storage
-%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/storage/*.so*
+%attr(755,root,root) %{_libdir}/glusterfs/%{_version}/xlator/storage/*.so
 
 %{_mandir}/man8/*.8*
 
@@ -269,6 +259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/02/03 15:59:29  matkor
+- seding -avoidversion -> -avoid-version, killed no longer needed patches.
+
 Revision 1.25  2009/02/03 14:39:45  matkor
 - Version 2.0.0rc1 in progress. Seems be more libtool 2.x compatible than 1.3.x line.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glusterfs.spec?r1=1.25&r2=1.26&f=u