- 2.2.13, added miscfix patch

Changed files:
    xfsdump-miscfix.patch -> 1.7
    xfsdump.spec -> 1.24

diff --git a/xfsdump-miscfix.patch b/xfsdump-miscfix.patch
new file mode 100644 (file)
index 0000000..9da87e4
--- /dev/null
+++ b/xfsdump-miscfix.patch
@@ -0,0 +1,28 @@
+--- xfsdump-2.2.13/m4/manual_format.m4.orig    2003-06-25 03:51:34.000000000 +0200
++++ xfsdump-2.2.13/m4/manual_format.m4 2003-08-08 21:33:33.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)
+   ])
+--- xfsdump-2.2.13/m4/package_utilies.m4.orig  2003-06-25 03:51:34.000000000 +0200
++++ xfsdump-2.2.13/m4/package_utilies.m4       2003-08-08 21:33:42.000000000 +0200
+@@ -17,9 +17,7 @@
+ #  MSGFMT MSGMERGE RPM
+ #
+ AC_DEFUN([AC_PACKAGE_UTILITIES],
+-  [ if test -z "$CC"; then
+-        AC_PROG_CC
+-    fi
++  [ AC_PROG_CC
+     cc="$CC"
+     AC_SUBST(cc)
+     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])

diff --git a/xfsdump.spec b/xfsdump.spec
index e951cebcfb43ea871dce9aa9c9bd8e20d2395e97..d423a41dcf63d0742628ad8b86d561f748477c1e 100644 (file)
--- a/xfsdump.spec
+++ b/xfsdump.spec
@@ -1,18 +1,20 @@
 Summary:       Tools for the XFS filesystem
 Summary(pl):   Narzêdzia do systemu plikowego XFS
 Name:          xfsdump
-Version:       2.2.6
+Version:       2.2.13
 Release:       1
 License:       GPL
 Group:         Applications/Archiving
-URL:           http://oss.sgi.com/projects/xfs/
 Source0:       ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5: e6282e66993c692d444cc21b5f8bb3eb
+# Source0-md5: 0e6b24628c695fa5b0c86a9c65f953c3
+Patch0:                %{name}-miscfix.patch
+URL:           http://oss.sgi.com/projects/xfs/
+BuildRequires: attr-devel
 BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: dmapi-devel >= 2.0.5-1
 BuildRequires: e2fsprogs-devel
 BuildRequires: xfsprogs-devel >= 2.1.2-2
-BuildRequires: attr-devel
-BuildRequires: dmapi-devel >= 2.0.5-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
@@ -45,24 +47,27 @@ ta
 funkcji optymalizuj±cych kopiê zapasow± (równie¿ znane jako
 rozszerzone atrybuty kopii zapasowych XFS). Stworzone kopie zapasowe
 s± "endian safe" i przez to mog± byæ przenoszone pomiêdzy maszynami
-Linuksowymi oraz IRIX pracuj±cymi na ró¿nych architekturach.
+linuksowymi oraz IRIX pracuj±cymi na ró¿nych architekturach.
 
 xfsrestore wykonuje operacjê przeciwn± do xfsdump; mo¿e on odzyskaæ
-system plików z kopii zapasowej. Inkrementalne kopie zapasowe mog± byæ
+system plików z kopii zapasowej. Przyrostowe kopie zapasowe mog± byæ
 u¿ywane w³±cznie z pe³n± kopi±.
 
 %prep
-%setup  -q
+%setup -q
+%patch -p1
 
 %build
-DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+rm -f aclocal.m4
+%{__aclocal} -I m4
 %{__autoconf}
 CPPFLAGS="-I/usr/include/ncurses"
-%configure
+%configure \
+       DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
+       OPTIMIZER="%{rpmcflags} -I/usr/include/ncurses"
 
 %{__make} \
-       LIBUUID="-luuid" \
-       OPTIMIZER="%{rpmcflags} -I/usr/include/ncurses"
+       LIBUUID="-luuid"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -71,8 +76,11 @@ DIST_ROOT="$RPM_BUILD_ROOT"
 DIST_INSTALL=`pwd`/install.manifest
 DIST_INSTALL_DEV=`pwd`/install-dev.manifest
 export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
-%{__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"
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/xfsrq.8*
 echo ".so man8/xfsdq.8" > $RPM_BUILD_ROOT%{_mandir}/man8/xfsrq.8