- updated to 2.6.25, updated miscfix-v2,cflags patches

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index d180497ad1f2e4011b2aa107ebd6096a611280dd..9ad9bdb4d62fa1845b602d210e98ee58e89e3667 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,19 +1,20 @@
 #
 # Conditional build:
-%bcond_with    static  # link statically with -luuid
+%bcond_with    static  # link statically with \-luuid
 #
 Summary:       Tools for the XFS filesystem
 Summary(pl):   Narzêdzia do systemu plików XFS
 Name:          xfsprogs
-Version:       2.6.0
+Version:       2.6.25
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5: 4336c70c0054029ad060c2e7a2d4e848
+# Source0-md5: 65fbf692f348b57f21edd4813733d9ae
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
 Patch2:                %{name}-sharedlibs.patch
+Patch3:                %{name}-cflags.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -27,8 +28,8 @@ Obsoletes:    libxfs1
 
 %define                _sbindir        /sbin
 %define                _bindir         /usr/sbin
-%define                _libdir         /lib
-%define                _libexecdir     /usr/lib
+%define                _libdir         /%{_lib}
+%define                _libexecdir     /usr/%{_lib}
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -56,7 +57,7 @@ B-drzewa by uzyska
 Summary:       Header files and libraries to develop XFS software
 Summary(pl):   Pliki nag³ówkowe i biblioteki
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     libxfs1-devel
 
 %description devel
@@ -71,7 +72,7 @@ operuj
 Summary:       Static XFS software libraries
 Summary(pl):   Biblioteki statyczne do XFS
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static XFS software libraries.
@@ -80,10 +81,11 @@ Static XFS software libraries.
 Biblioteki statyczne do XFS.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"
@@ -145,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/{CHANGES,CREDITS,README.*}
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
-%{!?with_static:%attr(755,root,root) /lib/lib*.so.*.*}
+%{!?with_static:%attr(755,root,root) /%{_lib}/lib*.so.*.*}
 %{_mandir}/man[185]/*
 
 %files devel
@@ -153,8 +155,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %{_includedir}/disk
 %{_includedir}/xfs
-%{!?with_static:%{_libexecdir}/*.la}
+%if %{without static}
+%{_libexecdir}/*.la
 %attr(755,root,root) %{_libexecdir}/*.so
+%endif
 
 %files static
 %defattr(644,root,root,755)