Accepting request 109525 from home:coolo:branches:openSUSE:Factory

- no need to link the lib in /lib

OBS-URL: https://build.opensuse.org/request/show/109525
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=16
This commit is contained in:
Michal Marek 2012-03-15 13:55:10 +00:00 committed by Git OBS Bridge
parent afbe84f84f
commit ee5d1c889c
2 changed files with 7 additions and 16 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 15 13:41:03 UTC 2012 - coolo@suse.com
- no need to link the lib in /lib
-------------------------------------------------------------------
Mon Feb 6 22:33:58 UTC 2012 - rschweikert@suse.com

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: xfsprogs
BuildRequires: e2fsprogs-devel
Version: 3.1.6
@ -46,12 +47,6 @@ Refer to the documentation at http://oss.sgi.com/projects/xfs/ for
complete details. This implementation is on-disk compatible with the
IRIX version of XFS.
Authors:
--------
SGI
%package devel
Requires: xfsprogs = %version
Url: http://oss.sgi.com/projects/xfs/
@ -66,12 +61,6 @@ You should install xfsprogs-devel if you want to develop XFS file
system-specific programs. If you install xfsprogs-devel, you will also
want to install xfsprogs.
Authors:
--------
SGI
%prep
%setup -q
%patch0
@ -96,9 +85,7 @@ rm $RPM_BUILD_ROOT/%_libdir/libhandle.so
mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT/%_lib/* $RPM_BUILD_ROOT%{_libdir}
#UsrMerge
ln -sf %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin
ln -sf %{_libdir}/libhandle.so.1 $RPM_BUILD_ROOT/%{_lib}
ln -sf %{_libdir}/libhandle.so.1.0.3 $RPM_BUILD_ROOT/%{_lib}
ln -s %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin
#EndUserMerge
pushd $RPM_BUILD_ROOT%_libdir
ln -s libhandle.so.[0-9] libhandle.so
@ -117,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,755)
#UsrMerge
/sbin/*
/%_lib/libhandle.so.*
#EndUsrMerge
%_sbindir/*
# this is only used by xfs cmds, therefore no urgent need for a shlib package