Hello community,

here is the log from the commit of package xfsdump for openSUSE:Factory checked 
in at 2012-03-02 13:50:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfsdump (Old)
 and      /work/SRC/openSUSE:Factory/.xfsdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfsdump", Maintainer is "mma...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xfsdump/xfsdump.changes  2012-02-23 
15:35:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xfsdump.new/xfsdump.changes     2012-03-02 
13:50:32.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Mar  1 00:42:18 UTC 2012 - rschweik...@suse.com
+
+- really place the binaries in /usr (UsrMerge project)
+  The configure and Makefiles do not respect the user settings to
+  configure for certain binaries. This lead to circular linkage on package
+  build and improper linkage on package install.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfsdump.spec ++++++
--- /var/tmp/diff_new_pack.Cw8HDu/_old  2012-03-02 13:50:33.000000000 +0100
+++ /var/tmp/diff_new_pack.Cw8HDu/_new  2012-03-02 13:50:33.000000000 +0100
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xfsdump
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libattr-devel
@@ -68,9 +69,12 @@
 %install
 export DIST_ROOT="$RPM_BUILD_ROOT"
 make install
+# Remove the link created by the make file
+rm $RPM_BUILD_ROOT/%{_sbindir}/{xfsdump,xfsrestore}
+mv $RPM_BUILD_ROOT/sbin/{xfsdump,xfsrestore} $RPM_BUILD_ROOT/%{_sbindir}
 #UsrMerge
-ln -sf %_sbindir/xfsdump $RPM_BUILD_ROOT/sbin
-ln -sf %_sbindir/xfsrestore $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/xfsdump $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin
 #EndUsrMerge 
 
 %clean
@@ -78,11 +82,11 @@
 
 %files
 %defattr(-,root,root,755)
- %_sbindir/*
+%{_sbindir}/*
 #UsrMerge
 /sbin/*
 #EndUsrMerge 
-%doc %_defaultdocdir/%name
-/usr/share/man/man8/*
+%doc %{_defaultdocdir}/%name
+%{_mandir}/man8/*
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to