Accepting request 103352 from filesystems

- use %configure

- place binaries in /usr tree (UsrMerge project)

- updated to 3.0.5
  - Release tags will now be digitally signed
  - Quota files will now be dumped, regardless of the maxsize
    setting
  - The new "-s sessid" flag allows inventory sessions to be pruned
    by their session ID.
  - Fixed a bug in handling long dump filenames, and dropped
    (undocumented) support for encoding certain parameters within
    the dump filename
  - NODECHK is now off by default, meaning xfsrestore will now
    support 16 times more directory entries (4 billion)
  - nrh_t is now 64 bits wide, allowing xfsrestore to support dumps
    with up to 4 billion directory entries
  - nix_t is no longer useful, and has been eliminated
  - Memory use in xfsrestore is better managed now.  Segments of
    nodes are now power-of-2 sized, and allocated nodes are no
    longer needlessly zeroed and linked into the free list.
  - Pathname resolution in xfsrestore has a number of performance
    improvements
  - Better checking has been implemented for compatibility when
    resuming a cumulative restore
  - Build system output has been cleaned up considerably
  - Dead "namreg" code has been removed
  - Build dependencies are now determined automatically
  - Other miscellaneous build system improvements, as well bug
    fixes thanks to Mike Frysinger and Arkadiusz Miśkiewicz.

OBS-URL: https://build.opensuse.org/request/show/103352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsdump?expand=0&rev=18

xfsdump-3.0.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c30dcfa827d0b3a96e6bb90d2edaab7300abb33da420ca1cb56de8a66f2140e
-size 679882

xfsdump-3.0.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3a86b37e268779c940996a7aba93ed1f04ad942cbc1b8d75aae1e447aa762ad
+size 797719

xfsdump-docdir.diff

@@ -1,7 +1,11 @@
---- include/builddefs.in
+---
+ include/builddefs.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- include/builddefs.in.orig
 +++ include/builddefs.in
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@ PKG_ROOT_SBIN_DIR = @root_sbindir@
- PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+ PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@
  PKG_INC_DIR	= @includedir@
  PKG_MAN_DIR	= @mandir@
 -PKG_DOC_DIR	= @datadir@/doc/@pkg_name@

xfsdump.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Mon Feb  6 22:27:49 UTC 2012 - rschweikert@suse.com
+
+- use %configure
+
+-------------------------------------------------------------------
+Thu Feb  2 18:41:51 UTC 2012 - rschweikert@suse.com
+
+- place binaries in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------
+Mon Jun 20 11:28:11 UTC 2011 - mmarek@novell.com
+
+- updated to 3.0.5
+  - Release tags will now be digitally signed
+  - Quota files will now be dumped, regardless of the maxsize
+    setting
+  - The new "-s sessid" flag allows inventory sessions to be pruned
+    by their session ID.
+  - Fixed a bug in handling long dump filenames, and dropped
+    (undocumented) support for encoding certain parameters within
+    the dump filename
+  - NODECHK is now off by default, meaning xfsrestore will now
+    support 16 times more directory entries (4 billion)
+  - nrh_t is now 64 bits wide, allowing xfsrestore to support dumps
+    with up to 4 billion directory entries
+  - nix_t is no longer useful, and has been eliminated
+  - Memory use in xfsrestore is better managed now.  Segments of
+    nodes are now power-of-2 sized, and allocated nodes are no
+    longer needlessly zeroed and linked into the free list.
+  - Pathname resolution in xfsrestore has a number of performance
+    improvements
+  - Better checking has been implemented for compatibility when
+    resuming a cumulative restore
+  - Build system output has been cleaned up considerably
+  - Dead "namreg" code has been removed
+  - Build dependencies are now determined automatically
+  - Other miscellaneous build system improvements, as well bug
+    fixes thanks to Mike Frysinger and Arkadiusz Miśkiewicz.
+  - Improve xfsinvutil man page and argument processing.
+  - Fix timestamp handling on 64-bit architectures in xfsinvutil.
+  - Various build system improvements.
+
 -------------------------------------------------------------------
 Mon Feb 22 23:28:43 CET 2010 - seife@opensuse.org
 

xfsdump.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package xfsdump (Version 3.0.1)
+# spec file for package xfsdump
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           xfsdump
-BuildRequires:  e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel
+BuildRequires:  e2fsprogs-devel
-Version:        3.0.1
+BuildRequires:  libattr-devel
-Release:        2
+BuildRequires:  ncurses-devel
-AutoReqProv:    on
+BuildRequires:  xfsprogs-devel
-Group:          System/Filesystems
+Version:        3.0.5
-License:        GPLv2+
+Release:        0
 Url:            http://oss.sgi.com/projects/xfs/
 Summary:        Administrative Utilities for the XFS File System
-Source0:        xfsdump-%version.tar.bz2
+License:        GPL-2.0+
+Group:          System/Filesystems
+Source0:        xfsdump-%version.tar.gz
 Patch0:         xfsdump-docdir.diff
 Patch1:         xfsdump-3.0.1-fix-bufferoverflow.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -63,25 +62,26 @@ Authors:
 %build
 export CFLAGS=$RPM_OPT_FLAGS
 export DEBUG=-DNDEBUG
-./configure \
+%configure --bindir=%{_sbindir} --mandir=%{_mandir}
-	--prefix=/usr 		\
-	--exec-prefix=/ 	\
-	--sbindir=/sbin		\
-	--bindir=/usr/sbin	\
-	--mandir=%{_mandir}
 make %{?jobs:-j%jobs}
 
 %install
 export DIST_ROOT="$RPM_BUILD_ROOT"
 make install
+#UsrMerge
+ln -sf %_sbindir/xfsdump $RPM_BUILD_ROOT/sbin
+ln -sf %_sbindir/xfsrestore $RPM_BUILD_ROOT/sbin
+#EndUsrMerge 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,755)
+ %_sbindir/*
+#UsrMerge
 /sbin/*
-/usr/sbin/*
+#EndUsrMerge 
 %doc %_defaultdocdir/%name
 /usr/share/man/man8/*