Hello community,

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

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

Changes:
--------
--- /work/SRC/openSUSE:Factory/fbset/fbset.changes      2011-10-04 
18:09:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fbset.new/fbset.changes 2012-02-20 
16:10:27.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 16 13:37:07 UTC 2012 - [email protected]
+
+- place binaries in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ fbset.spec ++++++
--- /var/tmp/diff_new_pack.71GMha/_old  2012-02-20 16:10:28.000000000 +0100
+++ /var/tmp/diff_new_pack.71GMha/_new  2012-02-20 16:10:28.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package fbset
 #
-# 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,18 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           fbset
-BuildRequires:  bison flex
-License:        GPL-2.0+
-Group:          System/Console
+BuildRequires:  bison
+BuildRequires:  flex
 PreReq:         %insserv_prereq %fillup_prereq
-AutoReqProv:    on
 Summary:        Framebuffer Configuration Tool
+License:        GPL-2.0+
+Group:          System/Console
 Version:        2.1
-Release:        920
+Release:        0
 %define fbdump_version 0.4.1
 Url:            http://users.telenet.be/geertu/Linux/fbdev/
 Source0:        %name-%version.tar.bz2
@@ -65,24 +63,32 @@
 cd ..
 
 %install
-make install \
-    DESTDIR=$RPM_BUILD_ROOT \
+%make_install \
     MANDIR=%{_mandir} \
-    SBINDIR=/sbin \
-    CONFDIR=/etc
+    SBINDIR=%{_sbindir} \
+    CONFDIR=%{_sysconfdir}
 cd fbdump
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 cd ..
 install -m 755 -d $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 644 %{S:2} 
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.console-fbset
 install -m 755 -d $RPM_BUILD_ROOT/etc/init.d
 install -m 755 %{S:3} $RPM_BUILD_ROOT/etc/init.d/fbset
+ln -sf /etc/init.d/fbset $RPM_BUILD_ROOT/%{_sbindir}/rcfbset
+#UsrMerge
+mkdir $RPM_BUILD_ROOT/sbin
 ln -sf /etc/init.d/fbset $RPM_BUILD_ROOT/sbin/rcfbset
+ln -sf %{_sbindir}/fbset $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/modeline2fb $RPM_BUILD_ROOT/sbin
+#EndUsrMerge
 
 %files
 %defattr(-,root,root)
 %doc etc/fb.modes*
+#UsrMerge
 /sbin/*
+#EndUsrMerge
+ %{_sbindir}/*
 /usr/bin/*
 %_mandir/man*/*
 %config(noreplace) /etc/fb.modes


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

Reply via email to