ailiopoulos/xfsdump
SHA256
1
0
Fork 0
forked from pool/xfsdump
Code Pull Requests Activity

Accepting request 107634 from home:rjschwei:branches:filesystems

Browse Source 
- 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/107634
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=10
This commit is contained in:
Jan Kara 2012-03-01 10:17:34 +00:00 committed by Git OBS Bridge
parent 753b9be200
commit 0bb5fd89b7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xfsdump.changes
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 Mon Feb 6 22:27:49 UTC 2012 - rschweikert@suse.com

14
xfsdump.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: xfsdump Name: xfsdump
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
@ -68,9 +69,12 @@ make %{?jobs:-j%jobs}
%install %install
export DIST_ROOT="$RPM_BUILD_ROOT" export DIST_ROOT="$RPM_BUILD_ROOT"
make install 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 #UsrMerge
ln -sf %_sbindir/xfsdump $RPM_BUILD_ROOT/sbin ln -s %{_sbindir}/xfsdump $RPM_BUILD_ROOT/sbin
ln -sf %_sbindir/xfsrestore $RPM_BUILD_ROOT/sbin ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin
#EndUsrMerge #EndUsrMerge
%clean %clean
@ -78,11 +82,11 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,755) %defattr(-,root,root,755)
%_sbindir/* %{_sbindir}/*
#UsrMerge #UsrMerge
/sbin/* /sbin/*
#EndUsrMerge #EndUsrMerge
%doc %_defaultdocdir/%name %doc %{_defaultdocdir}/%name
/usr/share/man/man8/* %{_mandir}/man8/*
%changelog %changelog