- updated

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 0f149505735684b605ccc3323f0349b08d332cb4..5a3cf122c41cfc50b73ed7f58712be2cec38897c 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,29 +1,32 @@
 #
 # Conditional build:
-%bcond_with    static  # link statically with -luuid
+%bcond_with    static          # link statically with \-luuid
+%bcond_with    dynamic_exe     # link executables dynamically with xfs libs
 #
 Summary:       Tools for the XFS filesystem
 Summary(pl):   Narzêdzia do systemu plików XFS
 Name:          xfsprogs
-Version:       2.6.0
-Release:       2
-License:       GPL
+Version:       2.8.3
+Release:       1
+License:       LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:         Applications/System
-Source0:       ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5: 4336c70c0054029ad060c2e7a2d4e848
+Source0:       ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
+# Source0-md5: 88703cf432f3e958f15a193e508c0e5c
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
 Patch2:                %{name}-sharedlibs.patch
+Patch3:                %{name}-dynamic_exe.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bash
+BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 %{?with_static:BuildRequires:  libuuid-static}
 %{?with_static:BuildRequires:  sed >= 4.0}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libxfs1
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
 %define                _bindir         /usr/sbin
@@ -56,7 +59,8 @@ 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:      libuuid-devel
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     libxfs1-devel
 
 %description devel
@@ -71,7 +75,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,14 +84,15 @@ Static XFS software libraries.
 Biblioteki statyczne do XFS.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%{?with_dynamic_exe:%patch3 -p1}
 
 %build
 DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"
-OPTIMIZER="%{rpmcflags}"
+OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
 export DEBUG OPTIMIZER
 rm -f aclocal.m4
 %{__aclocal} -I m4
@@ -134,15 +139,20 @@ ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxfs.so.*.*.*) \
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxlog.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
 
+%{__sed} -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
+       $RPM_BUILD_ROOT%{_libexecdir}/lib{disk,handle,xfs,xlog}.la
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/{CHANGES,CREDITS,README.*}
+%doc README doc/{CHANGES,CREDITS}
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
 %{!?with_static:%attr(755,root,root) /%{_lib}/lib*.so.*.*}
@@ -153,8 +163,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)