Hello community,

here is the log from the commit of package crda for openSUSE:Factory checked in 
at 2012-02-07 14:45:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crda (Old)
 and      /work/SRC/openSUSE:Factory/.crda.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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

Changes:
--------
--- /work/SRC/openSUSE:Factory/crda/crda.changes        2011-09-23 
01:54:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crda.new/crda.changes   2012-02-07 
14:45:10.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Feb  4 15:37:28 UTC 2012 - [email protected]
+
+- put files in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ crda.spec ++++++
--- /var/tmp/diff_new_pack.aqzPdU/_old  2012-02-07 14:45:11.000000000 +0100
+++ /var/tmp/diff_new_pack.aqzPdU/_new  2012-02-07 14:45:11.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package crda
 #
-# 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
@@ -20,13 +20,19 @@
 
 Name:           crda
 Summary:        802.11 central regulatory domain agent
-Version:        1.1.1
-Release:        1
-Group:          Hardware/Wifi
 License:        BSD-3-Clause
+Group:          Hardware/Wifi
+Version:        1.1.1
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libgcrypt-devel libnl-1_1-devel pkg-config python 
python-m2crypto udev wireless-regdb
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libnl-1_1-devel
+BuildRequires:  pkg-config
+BuildRequires:  python
+BuildRequires:  python-m2crypto
+BuildRequires:  udev
+BuildRequires:  wireless-regdb
 Requires:       wireless-regdb
 Supplements:    kernel >= 2.6.29
 
@@ -41,12 +47,20 @@
 make all_noverify %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} install
+#UsrMerge
+mkdir $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
+#EndUserMerge
 
 %files
 %defattr(-,root,root)
+%_sbindir/crda
+%_sbindir/regdbdump
+#UsrMerge
 /sbin/crda
 /sbin/regdbdump
+#EndUserMerge
 /lib/udev/rules.d/85-regulatory.rules
 /usr/share/man/man8/crda.8.gz
 /usr/share/man/man8/regdbdump.8.gz

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

Reply via email to