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

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/105729
OBS-URL: https://build.opensuse.org/package/show/Base:System/initviocons?expand=0&rev=10
This commit is contained in:
Marcus Meissner 2012-02-18 11:18:11 +00:00 committed by Git OBS Bridge
parent 2bbf247b32
commit e23e168e58
2 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 17 18:56:46 UTC 2012 - rschweikert@suse.com
- place binary in /usr tree (UsrMerge project)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 1 15:48:27 UTC 2011 - coolo@suse.com Thu Dec 1 15:48:27 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package initviocons # spec file for package initviocons
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -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: initviocons Name: initviocons
Url: http://svn.poeml.de/viewcvs/initviocons/ Url: http://svn.poeml.de/viewcvs/initviocons/
Version: 0.5 Version: 0.5
@ -48,19 +49,24 @@ Authors:
%build %build
export CFLAGS="$RPM_OPT_FLAGS -Wall" export CFLAGS="$RPM_OPT_FLAGS -Wall"
autoreconf -fi autoreconf -fi
%configure --bindir=/bin %configure
make make
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
make DESTDIR=$RPM_BUILD_ROOT install %make_install
mkdir -p $RPM_BUILD_ROOT/usr/bin install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes
install -m 0755 termprobes $RPM_BUILD_ROOT/usr/bin/termprobes #UsrMerge
mkdir -p $RPM_BUILD_ROOT/bin
ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin
#EndUsrMerge
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README %doc AUTHORS ChangeLog COPYING NEWS README
#UsrMerge
/bin/* /bin/*
/usr/bin/* #EndUsrMerge
%{_bindir}/*
%changelog %changelog