From 1ee2da34b3c71c1e51432287d4132faf63d45360 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 22 Jun 2007 16:53:51 +0000
Subject: [PATCH] OBS-URL:
https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=3
---
fsck.xfs | 19 -------
xfsprogs-no_la_in_root.diff | 11 ----
xfsprogs.changes | 10 ++++
xfsprogs.spec | 105 +++++++++++++++++-------------------
xfsprogs_2.8.20-1.tar.bz2 | 3 --
xfsprogs_2.8.21-1.tar.bz2 | 3 ++
6 files changed, 61 insertions(+), 90 deletions(-)
delete mode 100644 fsck.xfs
delete mode 100644 xfsprogs-no_la_in_root.diff
delete mode 100644 xfsprogs_2.8.20-1.tar.bz2
create mode 100644 xfsprogs_2.8.21-1.tar.bz2
diff --git a/fsck.xfs b/fsck.xfs
deleted file mode 100644
index c9be5e3..0000000
--- a/fsck.xfs
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -f
-#
-# Copyright (c) 2006 Silicon Graphics, Inc. All Rights Reserved.
-#
-
-AUTO=false
-while getopts ":aA" c
-do
- case $c in
- a|A) AUTO=true;;
- esac
-done
-if $AUTO; then
- echo "$0: XFS file system."
-else
- echo "If you wish to check the consistency of an XFS filesystem or"
- echo "repair a damaged filesystem, see xfs_check(8) and xfs_repair(8)."
-fi
-exit 0
diff --git a/xfsprogs-no_la_in_root.diff b/xfsprogs-no_la_in_root.diff
deleted file mode 100644
index 5e1b075..0000000
--- a/xfsprogs-no_la_in_root.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/buildmacros
-+++ include/buildmacros
-@@ -73,8 +73,6 @@
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
diff --git a/xfsprogs.changes b/xfsprogs.changes
index a8427bd..646367d 100644
--- a/xfsprogs.changes
+++ b/xfsprogs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 22 16:36:46 CEST 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 4 14:44:40 CEST 2007 - mmarek@suse.cz
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 2ed166a..36567d0 100644
--- a/xfsprogs.spec
+++ b/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.
diff --git a/xfsprogs_2.8.20-1.tar.bz2 b/xfsprogs_2.8.20-1.tar.bz2
deleted file mode 100644
index a61005e..0000000
--- a/xfsprogs_2.8.20-1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:533c6332b5680cb8b8332f81ab31cfa37ff08c60830258dec94b569934fde480
-size 765634
diff --git a/xfsprogs_2.8.21-1.tar.bz2 b/xfsprogs_2.8.21-1.tar.bz2
new file mode 100644
index 0000000..e9dd4b3
--- /dev/null
+++ b/xfsprogs_2.8.21-1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:789a9928fbb6ef163657c40e165d7abbe2a37b8b49f4dc8e32fe0f1a4a084d65
+size 767507