- updated

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 8288fa003712badf85be742e87e6a1d0b60a0677..5a3cf122c41cfc50b73ed7f58712be2cec38897c 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,21 +1,21 @@
 #
 # 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.25
-Release:       3
-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: 65fbf692f348b57f21edd4813733d9ae
+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}-cflags.patch
-Patch4:                %{name}-gcc4.patch
+Patch3:                %{name}-dynamic_exe.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -25,8 +25,8 @@ 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
@@ -88,12 +88,11 @@ Biblioteki statyczne do XFS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -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
@@ -143,15 +142,17 @@ ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo 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
 %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.*.*}