Hello community,

here is the log from the commit of package udhcp for openSUSE:Factory checked 
in at 2012-05-08 11:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/udhcp (Old)
 and      /work/SRC/openSUSE:Factory/.udhcp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "udhcp", Maintainer is "wk...@novell.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/udhcp/udhcp.changes      2011-09-23 
12:49:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.udhcp.new/udhcp.changes 2012-05-08 
11:15:54.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Apr 26 22:11:26 UTC 2012 - rschweik...@suse.com
+
+- place binary in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ udhcp.spec ++++++
--- /var/tmp/diff_new_pack.PaMK7B/_old  2012-05-08 11:15:56.000000000 +0200
+++ /var/tmp/diff_new_pack.PaMK7B/_new  2012-05-08 11:15:56.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package udhcp (Version 0.9.8)
+# spec file for package udhcp
 #
-# Copyright (c) 2009 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,15 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           udhcp
 Summary:        Micro DHCP client / server
-Version:        0.9.8
-Release:        3
 License:        GPL-2.0
 Group:          System/Emulators/PC
+Version:        0.9.8
+Release:        0
 Url:            http://udhcp.busybox.net
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         oracle-rpmbuild-makefile-changes.patch
@@ -58,17 +56,23 @@
 %{__make}
 
 %install
-%{__make} DESTDIR=%{buildroot} install
+%{make_install} SBINDIR=%{buildroot}/%{_sbindir}
 pushd %{buildroot}/%{_mandir}
 find . -type f -exec chmod -x {} \;
 popd
+#UsrMerge
+mkdir %{buildroot}/sbin
+ln -s %{_sbindir}/udhcpc %{buildroot}/sbin
+#EndUsrMerge
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+#UsrMerge
 /sbin/*
+#EndUsrMerge
 %{_bindir}/*
 %{_sbindir}/*
 %doc %{_mandir}/man?/*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to