- up to 2.5.4, updated miscfix-v2 patch

Changed files:
    xfsprogs-miscfix-v2.patch -> 1.3
    xfsprogs.spec -> 1.42

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index 927690bd79606fd624114c6a4d8868f88233fcc7..6f40b50c65a90f41e5738158f3b5a55725015d3e 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -1,17 +1,28 @@
-diff -urN ./old/xfsprogs-1.3.5/configure.in xfsprogs-1.3.5/configure.in
---- ./old/xfsprogs-1.3.5/configure.in  Thu Aug  9 21:04:48 2001
-+++ xfsprogs-1.3.5/configure.in        Wed Aug 29 09:12:23 2001
-@@ -201,13 +201,6 @@
- dnl also check if man page source is gzipped
- dnl (usually on Debian, but not Redhat pre-7.0)
- have_zipped_manpages=false
--for d in ${prefix}/share/man ${prefix}/man ; do
--    if test -f $d/man1/man.1.gz
--    then
--      have_zipped_manpages=true
--      break
+--- xfsprogs-2.5.4/m4/manual_format.m4.orig    2003-07-25 19:42:03.000000000 +0200
++++ xfsprogs-2.5.4/m4/manual_format.m4 2003-08-08 08:22:59.000000000 +0200
+@@ -6,12 +6,5 @@
+ # 
+ AC_DEFUN([AC_MANUAL_FORMAT],
+   [ have_zipped_manpages=false
+-    for d in ${prefix}/share/man ${prefix}/man ; do
+-        if test -f $d/man1/man.1.gz
+-        then
+-            have_zipped_manpages=true
+-            break
+-        fi
+-    done
+     AC_SUBST(have_zipped_manpages)
+   ])
+--- xfsprogs-2.5.4/m4/package_utilies.m4.orig  2003-07-25 19:42:03.000000000 +0200
++++ xfsprogs-2.5.4/m4/package_utilies.m4       2003-08-08 08:45:27.000000000 +0200
+@@ -17,9 +17,7 @@
+ #  MSGFMT MSGMERGE RPM
+ #
+ AC_DEFUN([AC_PACKAGE_UTILITIES],
+-  [ if test -z "$CC"; then
+-        AC_PROG_CC
 -    fi
--done
- AC_SUBST(have_zipped_manpages)
- 
- dnl build definitions for use in Makefiles
++  [ AC_PROG_CC
+     cc="$CC"
+     AC_SUBST(cc)
+     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 8fb95bf940c039e231300dcf1508e0b91c5f2d92..2263d78314426c0e8cf50a508117a840b2f91ec8 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,24 +1,26 @@
-# conditional build
-#  --with static
+#
+# Conditional build:
+# _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.3.9
+Version:       2.5.4
 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: 54aa76cfa24e8b3d3dec9432269fbc5a
+# Source0-md5: 0e7fcda7f4b286b4f703193af7d7de45
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
 Patch2:                %{name}-sharedlibs.patch
+URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bash
 BuildRequires: libtool
 BuildRequires: e2fsprogs-devel
 %{?_with_static:BuildRequires: e2fsprogs-static}
-URL:           http://oss.sgi.com/projects/xfs/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libxfs1
 
@@ -68,6 +70,7 @@ operuj
 Summary:       Static XFS software libraries
 Summary(pl):   Biblioteki statyczne do XFS
 Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}
 
 %description static
 Static XFS software libraries.
@@ -85,7 +88,8 @@ Biblioteki statyczne do XFS.
 DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"
 OPTIMIZER="%{rpmcflags}"
 export DEBUG OPTIMIZER
-%{__aclocal}
+rm -f aclocal.m4
+%{__aclocal} -I m4
 %{__autoconf}
 %configure \
        %{!?_with_static:--enable-shared-uuid=yes} \
@@ -102,8 +106,11 @@ DIST_INSTALL=`pwd`/install.manifest
 DIST_INSTALL_DEV=`pwd`/install-dev.manifest
 export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
 %{?_with_static:sed -i -e 's/\.lai/.la/' include/buildmacros}
-%{__make} install DIST_MANIFEST="$DIST_INSTALL"
-%{__make} install-dev DIST_MANIFEST="$DIST_INSTALL_DEV"
+
+%{__make} install \
+       DIST_MANIFEST="$DIST_INSTALL"
+%{__make} install-dev \
+       DIST_MANIFEST="$DIST_INSTALL_DEV"
 
 for man in attr_list_by_handle.3 attr_multi_by_handle.3 \
        fd_to_handle.3 free_handle.3 fssetdm_by_handle.3 \
@@ -117,10 +124,14 @@ done
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
 echo ".so xfs_growfs.8" > $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
 
-ln -sf %{_libdir}/libhandle.so.1.0.1 $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
-ln -sf %{_libdir}/libdisk.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libdisk.so
-ln -sf %{_libdir}/libxfs.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libxfs.so
-ln -sf %{_libdir}/libxlog.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libhandle.so.*.*.*) \
+        $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libdisk.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libexecdir}/libdisk.so
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxfs.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libexecdir}/libxfs.so
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxlog.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT