diff --git a/xfsdump.changes b/xfsdump.changes index c1e26a3..3e3c845 100644 --- a/xfsdump.changes +++ b/xfsdump.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/xfsdump.spec b/xfsdump.spec index 8da8635..6da4720 100644 --- a/xfsdump.spec +++ b/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,18 +15,17 @@ # 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 +BuildRequires: libattr-devel +BuildRequires: ncurses-devel +BuildRequires: xfsprogs-devel Version: 3.0.5 -Release: 2 -AutoReqProv: on -Group: System/Filesystems -License: GPLv2+ +Release: 0 Url: http://oss.sgi.com/projects/xfs/ Summary: Administrative Utilities for the XFS File System +License: GPL-2.0+ +Group: System/Filesystems Source0: xfsdump-%version.tar.gz Patch0: xfsdump-docdir.diff Patch1: xfsdump-3.0.1-fix-bufferoverflow.diff @@ -63,24 +62,26 @@ Authors: %build export CFLAGS=$RPM_OPT_FLAGS export DEBUG=-DNDEBUG -./configure \ - --prefix=/usr \ - --exec-prefix=/ \ - --sbindir=/sbin \ - --bindir=/usr/sbin \ - --mandir=%{_mandir} +%configure --bindir=%{_sbindir} --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/* +#EndUsrMerge %doc %_defaultdocdir/%name /usr/share/man/man8/*