Hello community, here is the log from the commit of package fbset checked in at Tue Dec 2 17:14:53 CET 2008. -------- --- fbset/fbset.changes 2008-11-28 16:19:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/fbset/fbset.changes 2008-12-02 16:20:52.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 2 16:16:45 CET 2008 - puzel@suse.cz + +- amended last change : + - on powerpc, leave /etc/fb.modes as is + - on other architectures, move fb.modes to %docdir + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fb.modes.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fbset.spec ++++++ --- /var/tmp/diff_new_pack.Lb6836/_old 2008-12-02 17:14:13.000000000 +0100 +++ /var/tmp/diff_new_pack.Lb6836/_new 2008-12-02 17:14:13.000000000 +0100 @@ -26,10 +26,11 @@ AutoReqProv: on Summary: Framebuffer Configuration Tool Version: 2.1 -Release: 918 +Release: 919 %define fbdump_version 0.4.1 Url: http://users.telenet.be/geertu/Linux/fbdev/ Source0: %name-%version.tar.bz2 +Source1: fb.modes.gz Source2: fbset.fillup Source3: rcfbset Source4: http://www.rcdrummond.net/fbdump/fbdump-src-%{fbdump_version}.tar.gz @@ -53,6 +54,7 @@ %setup -q -a 4 %patch0 %patch1 +zcat %{S:1} > etc/fb.modes mv fbdump-%{fbdump_version} fbdump %build @@ -78,13 +80,20 @@ 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/sbin/rcfbset +# delete fb.modes from /etc/ everywhere except powerpc (bnc#304995) +%ifnarch ppc ppc64 +rm -rf $RPM_BUILD_ROOT/etc/fb.modes +%endif %files %defattr(-,root,root) -%doc etc/fb.modes.* +%doc etc/fb.modes* /sbin/* /usr/bin/* %_mandir/man*/* +%ifarch ppc ppc64 +%config(noreplace) /etc/fb.modes +%endif /var/adm/fillup-templates/sysconfig.console-fbset %config /etc/init.d/fbset @@ -99,6 +108,10 @@ %{insserv_cleanup} %changelog +* Tue Dec 02 2008 puzel@suse.cz +- amended last change : + - on powerpc, leave /etc/fb.modes as is + - on other architectures, move fb.modes to %%docdir * Fri Nov 28 2008 puzel@suse.cz - /etc/fb.modes removed from installation (bnc#304995) * Thu Mar 29 2007 rguenther@suse.de ++++++ fbset-2.1-makefile.patch ++++++ --- /var/tmp/diff_new_pack.Lb6836/_old 2008-12-02 17:14:13.000000000 +0100 +++ /var/tmp/diff_new_pack.Lb6836/_new 2008-12-02 17:14:13.000000000 +0100 @@ -1,7 +1,6 @@ -diff -up ./Makefile.orig ./Makefile ---- ./Makefile.orig 2008-11-28 16:17:24.000000000 +0100 -+++ ./Makefile 2008-11-28 16:17:45.000000000 +0100 -@@ -2,40 +2,54 @@ +--- Makefile.orig 1999-01-17 20:15:46.000000000 +0100 ++++ Makefile 2003-04-24 15:08:04.000000000 +0200 +@@ -2,40 +2,55 @@ # Linux Frame Buffer Device Configuration # @@ -67,6 +66,7 @@ + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man{5,8} + $(INSTALL) -d $(DESTDIR)/$(SBINDIR) + $(INSTALL) -d $(DESTDIR)/$(CONFDIR) ++ $(INSTALL_DATA) etc/fb.modes $(DESTDIR)/$(CONFDIR)/fb.modes + $(INSTALL_PROGRAM) fbset $(DESTDIR)/$(SBINDIR) + $(INSTALL_PROGRAM) modeline2fb $(DESTDIR)/$(SBINDIR) + $(INSTALL_DATA) fb.modes.5 $(DESTDIR)/$(MANDIR)/man5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org