Hello community,

here is the log from the commit of package ifplugd for openSUSE:Factory checked 
in at 2012-02-21 12:19:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ifplugd (Old)
 and      /work/SRC/openSUSE:Factory/.ifplugd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ifplugd", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ifplugd/ifplugd.changes  2011-09-23 
02:03:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ifplugd.new/ifplugd.changes     2012-02-21 
12:19:51.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 17 16:04:05 UTC 2012 - [email protected]
+
+- place binaries in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ ifplugd.spec ++++++
--- /var/tmp/diff_new_pack.ke7vXb/_old  2012-02-21 12:19:52.000000000 +0100
+++ /var/tmp/diff_new_pack.ke7vXb/_new  2012-02-21 12:19:52.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package ifplugd (Version 0.28)
+# spec file for package ifplugd
 #
-# Copyright (c) 2010 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,17 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           ifplugd
-BuildRequires:  gcc-c++ libdaemon-devel lynx pkgconfig
+BuildRequires:  gcc-c++
+BuildRequires:  libdaemon-devel
+BuildRequires:  lynx
+BuildRequires:  pkgconfig
 Version:        0.28
-Release:        219
+Release:        0
 Summary:        Daemon Activating Network Interfaces on Cable Plug
 License:        GPL-2.0+
-Url:            http://0pointer.de/lennart/projects/ifplugd/
 Group:          Productivity/Networking/Other
+Url:            http://0pointer.de/lennart/projects/ifplugd/
 Source:         %{name}-%{version}.tar.gz
 Source1:        README.initscript
 Patch:          ifplugd.dif
@@ -56,15 +57,20 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D__KERNEL_STRICT_NAMES -fno-strict-aliasing"
-%configure --sbindir=/sbin --disable-xmltoman --disable-subversion 
+%configure --disable-xmltoman --disable-subversion 
 %{__make} %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 #will not work, can not combine "doc /" and "doc [^/]" ...
 #mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/ifplugd/
 #mv $RPM_BUILD_ROOT/etc/init.d/ifplugd 
$RPM_BUILD_DIR/%{name}-%{version}/doc/ifplugd.init
 rm -fv $RPM_BUILD_ROOT/etc/init.d/ifplugd
+#UsrMerge
+mkdir $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/ifplugd $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/ifplugstatus $RPM_BUILD_ROOT/sbin
+#EndUsrMerge
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,7 +79,10 @@
 %defattr (-,root,root)
 %doc LICENSE README doc/README.SuSE
 %doc conf/ifplugd.init README.initscript
+%{_sbindir}/*
+#UsrMerge
 /sbin/*
+#EndUsrMerge
 %doc %{_mandir}/man5/ifplugd.conf.5.gz
 %doc %{_mandir}/man8/ifplugd.8.gz
 %doc %{_mandir}/man8/ifplugstatus.8.gz

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to