Accepting request 107669 from filesystems

- 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.

OBS-URL: https://build.opensuse.org/request/show/107669
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsdump?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2012-03-02 12:50:30 +00:00 committed by Git OBS Bridge
commit c2b9db7c86
2 changed files with 17 additions and 5 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 00:42:18 UTC 2012 - rschweikert@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.
-------------------------------------------------------------------
Mon Feb 6 22:27:49 UTC 2012 - rschweikert@suse.com

View File

@ -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 @@ make %{?jobs:-j%jobs}
%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 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,755)
%_sbindir/*
%{_sbindir}/*
#UsrMerge
/sbin/*
#EndUsrMerge
%doc %_defaultdocdir/%name
/usr/share/man/man8/*
%doc %{_defaultdocdir}/%name
%{_mandir}/man8/*
%changelog