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

initviocons.changes

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

initviocons.spec

@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           initviocons
 Url:            http://svn.poeml.de/viewcvs/initviocons/
 Version:        0.5
@@ -48,19 +49,24 @@ Authors:
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wall"
 autoreconf -fi
-%configure --bindir=/bin
+%configure
 make
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 0755 termprobes $RPM_BUILD_ROOT/usr/bin/termprobes
+%make_install
+install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes
+#UsrMerge
+mkdir -p $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin
+#EndUsrMerge
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+%doc AUTHORS ChangeLog COPYING NEWS README
+#UsrMerge 
 /bin/*
-/usr/bin/*
+#EndUsrMerge
+%{_bindir}/*
 
 %changelog