Hello community,

here is the log from the commit of package fxload for openSUSE:Factory checked 
in at 2012-02-20 16:10:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fxload (Old)
 and      /work/SRC/openSUSE:Factory/.fxload.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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

Changes:
--------
--- /work/SRC/openSUSE:Factory/fxload/fxload.changes    2011-10-04 
18:10:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fxload.new/fxload.changes       2012-02-20 
16:10:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 15 18:50:31 UTC 2012 - [email protected]
+
+- place binary in the /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ fxload.spec ++++++
--- /var/tmp/diff_new_pack.7XbiFC/_old  2012-02-20 16:10:39.000000000 +0100
+++ /var/tmp/diff_new_pack.7XbiFC/_new  2012-02-20 16:10:39.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package fxload
 #
-# 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,16 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           fxload
 Url:            http://linux-hotplug.sf.net/
 Version:        2008_10_13
-Release:        3
-Group:          System/Kernel
+Release:        0
 Summary:        Download Firmware into USB FX and FX2 Devices
 License:        LGPL-2.1+
+Group:          System/Kernel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        
http://mesh.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2008_10_13.tar.bz2
 Patch0:         fxload-2002_04_11.patch
@@ -54,11 +52,18 @@
 make CC="%__cc" CFLAGS="$RPM_OPT_FLAGS -Wall -g"
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+%make_install
+#UsrMerge
+mkdir %{buildroot}/sbin
+ln -sf %{_sbindir}/fxload %{buildroot}/sbin
+#EndUsrMere
 
 %files
 %defattr(-,root,root)
-%attr(755,root,root) /sbin/*
+#UsrMerge
+/sbin/*
+#EndUsrMerge
+%attr(755,root,root) %{_sbindir}
 %{_mandir}/man?/*
 %dir /usr/share/usb
 /usr/share/usb/a3load.hex

++++++ fxload-2002_04_11.patch ++++++
--- /var/tmp/diff_new_pack.7XbiFC/_old  2012-02-20 16:10:39.000000000 +0100
+++ /var/tmp/diff_new_pack.7XbiFC/_new  2012-02-20 16:10:39.000000000 +0100
@@ -13,7 +13,7 @@
  exec_prefix =         ${prefix}
 -sbindir =             ${exec_prefix}/sbin
 -mandir =              ${prefix}/usr/share/man
-+sbindir =             /sbin
++sbindir =             /usr/sbin
 +mandir =              ${prefix}/share/man
 +
 +DESTDIR =

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

Reply via email to