Hello community, here is the log from the commit of package sisctrl for openSUSE:Factory checked in at Mon Sep 26 17:07:06 CEST 2011.
-------- --- sisctrl/sisctrl.changes 2009-03-10 10:35:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/sisctrl/sisctrl.changes 2011-09-26 12:58:50.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 26 10:57:42 UTC 2011 - [email protected] + +- fixed package license: GPL 2.0+ --> GPL 2.0 (bnc #720274) + +------------------------------------------------------------------- +Sat Sep 24 16:30:58 UTC 2011 - [email protected] + +- Fix build by linking with libm +- Fix rpmlint warning "no-return-in-nonvoid-function" + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sisctrl.spec ++++++ --- /var/tmp/diff_new_pack.40X6oN/_old 2011-09-26 17:06:50.000000000 +0200 +++ /var/tmp/diff_new_pack.40X6oN/_new 2011-09-26 17:06:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sisctrl (Version 0.0.20051202) +# spec file for package sisctrl # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,51 +15,45 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: sisctrl -BuildRequires: gtk2-devel pkgconfig update-desktop-files xorg-x11-devel -Url: http://www.winischhofer.net/ -License: GPL v2 or later -Group: System/X11/Utilities -AutoReqProv: on Version: 0.0.20051202 -Release: 221 +Release: 231 +# src/sisctrlext.c is licensed under the GPL-2.0 "only". Hence the below license +License: GPL-2.0 Summary: SiS Display Control Panel -Source: %name-%version.tar.gz -Patch: sisctrl.diff +Url: http://www.winischhofer.net/ +Group: System/X11/Utilities +Source: %{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE sisctrl.diff bnc#218755 bnc#483401 -- Add missing return value - Define functions, which don't return anything, as void - Fix build by linking with libm - Fix rpmlint warning "no-return-in-nonvoid-function" +Patch0: sisctrl.diff +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(gtk+-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Utility to set some display properties during server runtime. - - -Authors: --------- - Thomas Winischhofer <[email protected]> - -%define _xorglibdir %(pkg-config --variable prefix x11 || echo /usr/X11R6)/%_lib +%define _xorglibdir %(pkg-config --variable prefix x11 || echo /usr/X11R6)/%{_lib} %prep -%setup -%patch +%setup -q +%patch0 %build autoreconf -fi -./configure --prefix=/usr \ - --mandir=%{_mandir} \ - --with-xv-path=%{_xorglibdir} -make +%configure --with-xv-path=%{_xorglibdir} +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %files -%defattr(-, root, root) -/usr/bin/sisctrl +%defattr(-,root,root,-) +%{_bindir}/sisctrl %{_mandir}/man1/sisctrl.1x.gz %changelog ++++++ sisctrl.diff ++++++ --- /var/tmp/diff_new_pack.40X6oN/_old 2011-09-26 17:06:50.000000000 +0200 +++ /var/tmp/diff_new_pack.40X6oN/_new 2011-09-26 17:06:50.000000000 +0200 @@ -1,6 +1,6 @@ ---- src/sisctrl_gui.c.orig 2006-11-07 17:46:22.000000000 +0100 -+++ src/sisctrl_gui.c 2006-11-07 17:46:53.000000000 +0100 -@@ -5885,8 +5885,8 @@ +--- src/sisctrl_gui.c.orig ++++ src/sisctrl_gui.c +@@ -5885,8 +5885,8 @@ vi_layout_configure(GtkWidget *widget, G { /*fprintf(stderr, "conf\n");*/ if(gl.noxvdemo) return TRUE; @@ -11,9 +11,9 @@ if(!gui.xvinit) return TRUE; resizexvwindow(); showxvimage(); ---- src/sisctrl.c.orig 2009-03-10 09:07:19.000000000 +0000 -+++ src/sisctrl.c 2009-03-10 09:08:05.000000000 +0000 -@@ -419,7 +419,7 @@ +--- src/sisctrl.c.orig ++++ src/sisctrl.c +@@ -419,7 +419,7 @@ newsetrealxvval(unsigned int cmd, Atom a /* Get/Set gamma brightness. Does proper unlocking/locking */ @@ -22,7 +22,7 @@ sd_writegammabr(unsigned int br, unsigned int bg, unsigned int bb) { if(UnlockSiSDirect(1)) { -@@ -433,7 +433,7 @@ +@@ -433,7 +433,7 @@ sd_writegammabr(unsigned int br, unsigne } else fprintf(stderr, xverrorstring); } @@ -31,3 +31,34 @@ sd_writenewgammabr(unsigned int br, unsigned int bg, unsigned int bb, unsigned int cr, unsigned int cg, unsigned int cb) { +@@ -1169,6 +1169,7 @@ checkmodeforgivencrt2(int index, unsigne + #else + return 0x80; + #endif ++ return 0x80; + } + + static int +--- configure.ac.orig ++++ configure.ac +@@ -9,7 +9,10 @@ AC_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE + + # Checks for programs. +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE ++AM_PROG_CC_C_O + + # Checks for libraries. + +@@ -211,6 +214,8 @@ AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR([ + *** GTK+ 2.4 or later is required to build sisctrl; please make sure you have the GTK+ + *** development headers installed.])) + ++AC_SEARCH_LIBS(sin, m) ++ + AC_OUTPUT([Makefile],) + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
