Accepting request 105285 from home:rjschwei:branches:Base:System

- put binaries in /usr tree (UsrMerge) project

OBS-URL: https://build.opensuse.org/request/show/105285
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=61
This commit is contained in:
Petr Uzel 2012-02-17 14:33:01 +00:00 committed by Git OBS Bridge
parent ba4d0b6172
commit bfc53f4830
2 changed files with 17 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 15 18:22:03 UTC 2012 - rschweikert@suse.com
- put binaries in /usr tree (UsrMerge) project
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 13:44:39 UTC 2012 - puzel@suse.com Mon Feb 6 13:44:39 UTC 2012 - puzel@suse.com

View File

@ -16,7 +16,6 @@
# #
Name: hdparm Name: hdparm
PreReq: %insserv_prereq %fillup_prereq coreutils PreReq: %insserv_prereq %fillup_prereq coreutils
Provides: base:/sbin/hdparm Provides: base:/sbin/hdparm
@ -50,9 +49,9 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall -Wstrict-prototypes" LDFLAGS= CC="%{__cc}"
cp -p wiper/README.txt README.wiper cp -p wiper/README.txt README.wiper
%install %install
mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_sbindir}
%make_install binprefix=%{_prefix}
mv contrib/README contrib/README.contrib mv contrib/README contrib/README.contrib
install -d $RPM_BUILD_ROOT/lib/udev/rules.d install -d $RPM_BUILD_ROOT/lib/udev/rules.d
install -m 644 %{S:1} $RPM_BUILD_ROOT/lib/udev/rules.d install -m 644 %{S:1} $RPM_BUILD_ROOT/lib/udev/rules.d
@ -62,7 +61,12 @@ install -m 755 %{S:3} $RPM_BUILD_ROOT/lib/udev/idedma.sh
install -d $RPM_BUILD_ROOT/usr/lib/hdparm install -d $RPM_BUILD_ROOT/usr/lib/hdparm
install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm
install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm
install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/sbin install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/%{_sbindir}
#UsrMerge
mkdir -p $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/wiper.sh $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/hdparm $RPM_BUILD_ROOT/sbin
#EndUsrMerge
%post %post
if [ -f etc/sysconfig/hardware ] ; then if [ -f etc/sysconfig/hardware ] ; then
@ -97,8 +101,12 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc Changelog README.acoustic contrib/README.contrib README.wiper %doc Changelog README.acoustic contrib/README.contrib README.wiper
%doc %{_mandir}/man8/hdparm.8.gz %doc %{_mandir}/man8/hdparm.8.gz
#UsrMerge
/sbin/hdparm /sbin/hdparm
/sbin/wiper.sh /sbin/wiper.sh
#EndUserMerge
%{_sbindir}/hdparm
%{_sbindir}/wiper.sh
%dir /lib/udev %dir /lib/udev
/lib/udev/idedma.sh /lib/udev/idedma.sh
%dir /lib/udev/rules.d %dir /lib/udev/rules.d