OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=3

xfsprogs.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package xfsprogs (Version 2.8.20)
+# spec file for package xfsprogs (Version 2.8.21)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,9 +12,8 @@
 
 Name:           xfsprogs
 BuildRequires:  e2fsprogs-devel
-Version:        2.8.20
+Version:        2.8.21
 Release:        1
-Conflicts:      xfsdump < 2.0.0
 # hint for ZYPP
 Supplements:    filesystem(xfs)
 Autoreqprov:    on
@@ -23,10 +22,8 @@ License:        GNU General Public License (GPL)
 URL:            http://oss.sgi.com/projects/xfs/
 Summary:        Utilities for managing the XFS file system
 Source0:        xfsprogs_%{version}-1.tar.bz2
-Source1:        fsck.xfs
 Patch0:         xfsprogs-docdir.diff
-Patch1:         xfsprogs-no_la_in_root.diff
-Patch2:         xfsprogs-ppc64.diff
+Patch1:         xfsprogs-ppc64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,8 +47,7 @@ Authors:
     SGI
 
 %package      devel
-Requires:       xfsprogs >= 2.0.0 
-Conflicts:      xfsprogs < 2.0.0
+Requires:       xfsprogs = %version
 Autoreqprov:    on
 Group:          Development/Libraries/C and C++
 License:        GNU General Public License (GPL)
@@ -76,7 +72,6 @@ Authors:
 %setup -q
 %patch0
 %patch1
-%patch2
 
 %build
 %{suse_update_config -f}
@@ -87,68 +82,64 @@ export CFLAGS="$RPM_OPT_FLAGS"
 aclocal --force
 autoconf --force
 ./configure \
---prefix=%{_prefix} \
---exec-prefix=/ \
---sbindir=/sbin \
---bindir=%{_sbindir} \
---libdir=/%{_lib} \
---libexecdir=/usr/%{_lib} \
---includedir=%{_includedir} \
---mandir=%{_mandir} \
---datadir=%{_datadir}
+	--prefix=%{_prefix} \
+	--exec-prefix=/ \
+	--sbindir=/sbin \
+	--bindir=%{_sbindir} \
+	--libdir=/%{_lib} \
+	--libexecdir=/usr/%{_lib} \
+	--includedir=%{_includedir} \
+	--mandir=%{_mandir} \
+	--datadir=%{_datadir}
 make %{?jobs:-j %jobs}
 
 %install
-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
-/usr/bin/make install DIST_MANIFEST="$DIST_INSTALL"
-/usr/bin/make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV"
-rm -rf $RPM_BUILD_ROOT/sbin/fsck.xfs
-install -m755 %{S:1} $RPM_BUILD_ROOT/sbin
-files()
-{
-	sort | uniq | awk ' 
-$1 == "d" { printf ("%%%%dir %%%%attr(%s,root,root) %s\n", $2, $5); } 
-$1 == "f" { if (match ($6, "/usr/share/man") || match ($6, "/usr/share/doc/packages/xfsprogs"))
-		printf ("%%%%doc ");
-	    if (match ($6, "/usr/share/man"))
-		printf ("%%%%attr(%s,root,root) %s*\n", $2, $6);
-	    else
-	    if (match ($6, "/libhandle.so"))
-		printf ("%%%%attr(0755,root,root) %s\n", $6); 
-	      else
-                printf ("%%%%attr(%s,root,root) %s\n", $2, $6);
-}
-$1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/packages/xfsprogs"))
-		printf ("%%%%doc ");
-	    if (match ($3, "/usr/share/man"))
-		printf ("%attr(0777,root,root) %s*\n", $3);
-	    else
-		printf ("%attr(0777,root,root) %s\n", $3); }'
-}
-set +x
-files < "$DIST_INSTALL" | egrep -v -e "^%%dir.*/sbin$" -e "^%%dir.*/man[58]$" -e "^%%dir.*/lib(64)?$" -e "^%%dir.*/usr/share/locale" > files.rpm
-files < "$DIST_INSTALL_DEV" | egrep -v -e "^%%dir.*/lib(64)?$" -e "^%%dir.*/man3$" > filesdevel.rpm
-set -x
+export DIST_ROOT="$RPM_BUILD_ROOT"
+/usr/bin/make install
+/usr/bin/make install-dev
+# remove devel stuff from /lib
+rm $RPM_BUILD_ROOT/%_lib/libhandle.{so,a,la}
+rm $RPM_BUILD_ROOT/%_libdir/libhandle.so
+pushd $RPM_BUILD_ROOT%_libdir
+	ls ../../%_lib/libhandle.so.[0-9]
+	ln -s ../../%_lib/libhandle.so.[0-9] libhandle.so
+popd
+chmod 755 $RPM_BUILD_ROOT/sbin/fsck.xfs
+%find_lang %name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
 
-%files -f files.rpm
+%files -f %name.lang
 %defattr(-,root,root,755)
+/sbin/*
+/usr/sbin/*
+# this is only used by xfs cmds, therefore no urgent need for a shlib package
+/%_lib/libhandle.so.*
+%doc /usr/share/man/man[58]/*
+%doc %_defaultdocdir/%name
 
-%files devel -f filesdevel.rpm
+%files devel
 %defattr(-,root,root,755)
+/usr/include/disk
+/usr/include/xfs
+%_libdir/*.so
+%_libdir/*.a
+%_libdir/*.la
+/usr/share/man/man3/*
 
 %changelog
+* Fri Jun 22 2007 - mmarek@suse.cz
+- updated to 2.8.21
+  * Add support for lazy superblock counters in mkfs.xfs, xfs_db,
+  xfs_repair, xfs_growfs and also libxfs.
+  * Fix xfs_quota project command to stop it operating on special files.
+  Thanks to Leo Baltus.
+- specfile cleanup
 * Wed Apr 04 2007 - mmarek@suse.cz
 - updated to version 2.8.20
   * Fix xfs_repair not detecting invalid btree root in inodes.