- openSUSE Commits

commit awesfx for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package awesfx for openSUSE:Factory checked in at Wed Sep 21 16:52:29 CEST 2011. -------- --- awesfx/awesfx.changes 2011-03-29 08:41:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/awesfx/awesfx.changes 2011-09-17 15:55:30.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 13:55:26 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ awesfx.spec ++++++ --- /var/tmp/diff_new_pack.f0Ttk1/_old 2011-09-21 16:52:24.000000000 +0200 +++ /var/tmp/diff_new_pack.f0Ttk1/_new 2011-09-21 16:52:24.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: awesfx @@ -33,12 +32,6 @@ The AWESFX package includes utility programs for controlling the wavetable function on SB AWE32/64 and Emu10k1 sound cards. - - -Authors: --------- - Takashi Iwai <tiwai(a)suse.de> - %prep %setup -q @@ -46,7 +39,7 @@ autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -57,9 +50,6 @@ install -c -m 0755 etc/load-soundfont $RPM_BUILD_ROOT/etc/alsa.d install -c -m 0755 etc/udev-soundfont $RPM_BUILD_ROOT/etc/alsa.d -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc AUTHORS COPYING README ChangeLog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit audacity for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at Wed Sep 21 16:52:18 CEST 2011. -------- --- audacity/audacity.changes 2011-09-07 09:38:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/audacity/audacity.changes 2011-09-17 15:34:34.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 13:34:29 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.tomB10/_old 2011-09-21 16:52:13.000000000 +0200 +++ /var/tmp/diff_new_pack.tomB10/_new 2011-09-21 16:52:13.000000000 +0200 @@ -129,9 +129,6 @@ %__rm -rf %{buildroot}%{_datadir}/doc/audacity %find_lang %{name} -%clean -rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root) %doc LICENSE.txt README.txt LICENSE_NYQUIST.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at Wed Sep 21 16:52:06 CEST 2011. -------- --- at/at.changes 2011-05-13 16:02:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/at/at.changes 2011-09-17 15:28:33.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 13:28:30 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.pPjMZV/_old 2011-09-21 16:52:02.000000000 +0200 +++ /var/tmp/diff_new_pack.pPjMZV/_new 2011-09-21 16:52:02.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: at @@ -24,7 +23,6 @@ Url: ftp://ftp.debian.org/debian/pool/main/a/at License: GPLv2+ Group: System/Daemons -AutoReqProv: on Version: 3.1.8 Release: 1102 Summary: A Job Manager @@ -67,15 +65,6 @@ %description This program allows you to run jobs at specified times. - - -Authors: --------- - Thomas Koenig <ig25(a)rz.uni-karlsruhe.de> - David Parsons <orc(a)pell.chi.il.us> - Martin Schulze <joey(a)debian.org> - Siggy Brentrup <bsb(a)winnegan.de> - %prep %setup -q %patch0 @@ -109,7 +98,7 @@ --with-selinux \ --with-daemon_username=at \ --with-daemon_groupname=at -make +make %{?_smp_mflags} %install mkdir -p $RPM_BUILD_ROOT/etc/{init.d,pam.d} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aseqview for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package aseqview for openSUSE:Factory checked in at Wed Sep 21 16:51:56 CEST 2011. -------- --- aseqview/aseqview.changes 2010-03-05 09:59:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/aseqview/aseqview.changes 2011-09-17 14:23:43.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 12:23:40 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aseqview.spec ++++++ --- /var/tmp/diff_new_pack.pCBYU5/_old 2011-09-21 16:51:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pCBYU5/_new 2011-09-21 16:51:52.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package aseqview (Version 0.2.7) +# spec file for package aseqview # -# Copyright (c) 2010 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,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: aseqview @@ -39,12 +38,6 @@ off, controls, and pitch wheels, using bar graphs as seen in many sequencer applications. - - -Authors: --------- - Takashi Iwai <tiwai(a)suse.de> - %prep %setup %patch0 @@ -53,7 +46,7 @@ %build autoreconf --force --install %configure --enable-gtk2 -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -61,9 +54,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %{_bindir}/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Sep 21 16:51:45 CEST 2011. -------- --- aaa_base/aaa_base.changes 2011-09-16 16:05:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-09-17 12:40:27.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 10:40:22 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.rnogBy/_old 2011-09-21 16:51:39.000000000 +0200 +++ /var/tmp/diff_new_pack.rnogBy/_new 2011-09-21 16:51:39.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %bcond_with aaa_base_malloc_debug @@ -31,7 +30,6 @@ Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv -AutoReqProv: on Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build # run make package in checkout out git repo to recreate @@ -58,7 +56,7 @@ %setup -n aaa_base %build -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} if test -d patches/$RPM_ARCH; then pushd files for file in ../patches/$RPM_ARCH/*; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PolicyKit for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package PolicyKit for openSUSE:Factory checked in at Wed Sep 21 16:51:29 CEST 2011. -------- --- PolicyKit/PolicyKit-doc.changes 2011-07-06 10:15:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/PolicyKit/PolicyKit-doc.changes 2011-09-17 12:08:23.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 10:07:57 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- --- PolicyKit/PolicyKit.changes 2011-07-06 10:15:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/PolicyKit/PolicyKit.changes 2011-09-17 12:08:23.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 10:07:48 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PolicyKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.pJLw1L/_old 2011-09-21 16:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.pJLw1L/_new 2011-09-21 16:51:24.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %if 0%{?suse_version} > 1100 %bcond_without selinux @@ -41,7 +40,6 @@ Group: System/Libraries Version: 0.9 Release: 28 -AutoReqProv: on Summary: Authorization Toolkit BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %build_doc @@ -70,12 +68,6 @@ used for allowing unprivileged processes to speak to privileged processes. - - -Authors: --------- - David Zeuthen <davidz(a)redhat.com> - %if !%build_doc %package -n PolicyKit-devel @@ -91,12 +83,6 @@ used for allowing unprivileged processes to speak to privileged processes. - - -Authors: --------- - David Zeuthen <davidz(a)redhat.com> - %endif %prep @@ -157,8 +143,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc %endif -%clean -rm -rf $RPM_BUILD_ROOT %if !%build_doc %pre ++++++ PolicyKit.spec ++++++ --- /var/tmp/diff_new_pack.pJLw1L/_old 2011-09-21 16:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.pJLw1L/_new 2011-09-21 16:51:24.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %if 0%{?suse_version} > 1100 %bcond_without selinux @@ -41,7 +40,6 @@ Group: System/Libraries Version: 0.9 Release: 33 -AutoReqProv: on Summary: Authorization Toolkit BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %build_doc @@ -70,12 +68,6 @@ used for allowing unprivileged processes to speak to privileged processes. - - -Authors: --------- - David Zeuthen <davidz(a)redhat.com> - %if !%build_doc %package -n PolicyKit-devel @@ -91,12 +83,6 @@ used for allowing unprivileged processes to speak to privileged processes. - - -Authors: --------- - David Zeuthen <davidz(a)redhat.com> - %endif %prep @@ -157,8 +143,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc %endif -%clean -rm -rf $RPM_BUILD_ROOT %if !%build_doc %pre ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ImageMagick for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Wed Sep 21 16:51:17 CEST 2011. -------- --- ImageMagick/ImageMagick.changes 2011-09-17 11:36:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick.changes 2011-09-20 15:24:25.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Sep 20 13:22:37 UTC 2011 - pgajdos(a)suse.com + +- update to 6.7.2.7: + * Fix memory leak in text annotation. + * The "-strip" option was excluding the PNG tRNS chunk. + * Caption now wraps properly for Chinese text. + * The PNG encoder would sometimes fail to respect the -define + PNG:color-type option when the incoming image was PseudoClass. + * Properly handled continued JPEG embedded profiles. + * Revert -colorspace sRGB option patch. + * Revert -type PaletteMatte option patch. + * etc. see ChangeLog. +- obsoletes reason-error-message.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ImageMagick-6.7.1-0-reason-error-message.patch ImageMagick-6.7.1-0.tar.bz2 New: ---- ImageMagick-6.7.2-7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.UbpGf2/_old 2011-09-21 16:51:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UbpGf2/_new 2011-09-21 16:51:10.000000000 +0200 @@ -83,14 +83,14 @@ %endif %define xtp_version 5.4.3 -%define mfr_version 6.7.1 -%define mfr_revision 0 +%define mfr_version 6.7.2 +%define mfr_revision 7 %define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other Version: %{mfr_version}.%{mfr_revision} Release: 1 -%define libver 4 +%define libver 5 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 @@ -106,7 +106,6 @@ # see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit… # for upstream progress Patch3: ImageMagick-6.6.9.1-inc-struct.diff -Patch4: ImageMagick-6.7.1-0-reason-error-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: imagemag = %{version} Obsoletes: imagemag < %{version} @@ -199,7 +198,6 @@ %patch1 %patch2 %patch3 -p1 -%patch4 # remove together with inc-struct.diff ---- echo>header-test.c '#include "wand.h"' # echo>wand.h '#include "wand/MagickWand.h"' # @@ -504,4 +502,6 @@ + + %changelog ++++++ ImageMagick-6.7.1-0.tar.bz2 -> ImageMagick-6.7.2-7.tar.bz2 ++++++ ImageMagick/ImageMagick-6.7.1-0.tar.bz2 /mounts/work_src_done/STABLE/ImageMagick/ImageMagick-6.7.2-7.tar.bz2 differ: char 11, line 1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.UbpGf2/_old 2011-09-21 16:51:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UbpGf2/_new 2011-09-21 16:51:10.000000000 +0200 @@ -1,6 +1,6 @@ -libMagickCore4 -libMagickWand4 +libMagickCore5 +libMagickWand5 ImageMagick-devel requires -ImageMagick-<targettype> - requires "libMagickCore4-<targettype> = <version>" - requires "libMagickWand4-<targettype> = <version>" + requires "libMagickCore5-<targettype> = <version>" + requires "libMagickWand5-<targettype> = <version>" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ElectricFence for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package ElectricFence for openSUSE:Factory checked in at Wed Sep 21 16:50:54 CEST 2011. -------- --- ElectricFence/ElectricFence.changes 2007-04-19 12:07:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/ElectricFence/ElectricFence.changes 2011-09-17 11:15:14.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 09:15:07 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Enable parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ElectricFence.spec ++++++ --- /var/tmp/diff_new_pack.LS3eku/_old 2011-09-21 16:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.LS3eku/_new 2011-09-21 16:50:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ElectricFence (Version 2.2.2) +# spec file for package ElectricFence # -# 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,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: ElectricFence @@ -23,7 +22,6 @@ Group: Development/Tools/Debuggers Provides: efence Obsoletes: efence -AutoReqProv: on Version: 2.2.2 Release: 667 Summary: Malloc Debugger @@ -38,12 +36,6 @@ %description Tool for debugging your C programs (malloc debugger). - - -Authors: --------- - Bruce Perens <Bruce(a)Pixar.com> - %prep %setup -q %patch0 @@ -52,7 +44,7 @@ %patch3 %build -make CFLAGS="$RPM_OPT_FLAGS -g -DUSE_SEMAPHORE -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -g -DUSE_SEMAPHORE -fPIC" %{?_smp_mflags} %install install -D -d -m755 $RPM_BUILD_ROOT%{_bindir} @@ -69,9 +61,6 @@ %postun %{run_ldconfig} -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README CHANGES COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ConsoleKit for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at Wed Sep 21 16:50:39 CEST 2011. -------- --- ConsoleKit/ConsoleKit-doc.changes 2011-09-16 13:20:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit-doc.changes 2011-09-17 11:12:51.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 09:12:39 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- --- ConsoleKit/ConsoleKit.changes 2011-09-16 13:20:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit.changes 2011-09-17 11:12:51.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 09:12:29 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from spec + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.JqZBOi/_old 2011-09-21 16:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.JqZBOi/_new 2011-09-21 16:50:34.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: ConsoleKit-doc @@ -40,7 +39,6 @@ Release: 1 License: GPLv2+ Group: System/Daemons -AutoReqProv: on Source: %{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +58,6 @@ License: GPLv2+ Summary: Developer package for ConsoleKit Requires: %{pkg_name} = %{version}-%{release}, dbus-1-devel -AutoReqProv: on Group: Development/Libraries/Other %description -n ConsoleKit-devel @@ -70,7 +67,6 @@ License: GPLv2+ Summary: System daemon for tracking users, sessions and seats Requires: %{pkg_name} = %{version}-%{release} -AutoReqProv: on Group: System/Daemons %description -n ConsoleKit-x11 @@ -145,9 +141,6 @@ /sbin/ldconfig %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %if %{build_doc} ConsoleKit.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gimp for openSUSE:Factory
by root＠hilbert.suse.de 21 Sep '11

21 Sep '11

Hello community, here is the log from the commit of package gimp for openSUSE:Factory checked in at Wed Sep 21 11:34:27 CEST 2011. -------- --- GNOME/gimp/gimp.changes 2011-09-20 01:06:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/gimp/gimp.changes 2011-09-20 16:54:17.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 20 13:34:58 UTC 2011 - vuntz(a)opensuse.org + +- Update gimp-fix-linking.patch: add another missing -lm. +- Add gimp-poppler-0.18.patch: fix build with poppler 0.17/0.18. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gimp-poppler-0.18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.VqpMlj/_old 2011-09-21 11:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.VqpMlj/_new 2011-09-21 11:33:55.000000000 +0200 @@ -52,7 +52,7 @@ BuildRequires: xorg-x11-libXfixes-devel Url: http://www.gimp.org/ Version: 2.6.11 -Release: 21 +Release: 23 License: GPLv2+ Group: Productivity/Graphics/Bitmap Editors Suggests: AdobeICCProfiles @@ -70,12 +70,14 @@ Patch0: gimp-CVE-2010-4540-and-more.patch # PATCH-FIX-UPSTREAM gimp-CVE-2010-4543.patch CVE-2010-4543 bgo#639203 bnc#662043 vuntz(a)opensuse.org -- Fix a buffer overflow when reading a psp file Patch1: gimp-CVE-2010-4543.patch -# PATCH-FIX-UPSTREAM gimp-fix-linking.patch vuntz(a)opensuse.org -- Fix linking issue because of missing libs, taken from git +# PATCH-FIX-UPSTREAM gimp-fix-linking.patch bgo#659586 vuntz(a)opensuse.org -- Fix linking issue because of missing libs Patch2: gimp-fix-linking.patch # PATCH-FIX-UPSTREAM gimp-CVE-2011-2896.patch CVE-2011-2896 bnc#711491 vuntz(a)opensuse.org -- Fix heap corruption and buffer overflow Patch3: gimp-CVE-2011-2896.patch # PATCH-FIX-UPSTREAM gimp-pyslice-cellspacing-fix.patch vuntz(a)opensuse.org -- Fix pyslice to not crash Patch4: gimp-pyslice-cellspacing-fix.patch +# PATCH-FIX-UPSTREAM gimp-poppler-0.18.patch vuntz(a)opensuse.org -- Fix build with poppler 0.18, taken from fedora +Patch5: gimp-poppler-0.18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding = %{version} Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin %{name}-help-browser @@ -268,6 +270,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Safety check for ABI version change. vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)` if test "x${vabi}" != "x%{abiver}"; then ++++++ gimp-fix-linking.patch ++++++ --- /var/tmp/diff_new_pack.VqpMlj/_old 2011-09-21 11:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.VqpMlj/_new 2011-09-21 11:33:55.000000000 +0200 @@ -24,3 +24,16 @@ install-data-local: install-ms-lib install-libtool-import-lib -- cgit v0.9.0.2 +Index: gimp-2.6.11/plug-ins/script-fu/Makefile.am +=================================================================== +--- gimp-2.6.11.orig/plug-ins/script-fu/Makefile.am ++++ gimp-2.6.11/plug-ins/script-fu/Makefile.am +@@ -8,7 +8,7 @@ libgimpbase = $(top_builddir)/libgimpbas + libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la + libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la + +-libtinyscheme=tinyscheme/libtinyscheme.a ++libtinyscheme=tinyscheme/libtinyscheme.a -lm + libftx=ftx/libftx.a + + if OS_WIN32 ++++++ gimp-poppler-0.18.patch ++++++ >From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 From: Nils Philippsen <nils(a)redhat.com> Date: Fri, 6 May 2011 11:58:44 +0200 Subject: [PATCH] patch: poppler-0.17 Squashed commit of the following: commit 529d940222dfc352d41fbf72de29134421aa4002 Author: Nils Philippsen <nils(a)redhat.com> Date: Fri May 6 11:50:30 2011 +0200 use code based on pixbufs instead of cairo surfaces this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for hints how to do this commit f8671d8767d4cdab830dc06310e96c63a88ec0fd Author: Mukund Sivaraman <muks(a)banu.com> Date: Thu Apr 21 13:57:13 2011 +0530 file-pdf-load: Update attribution, removing bogus copyright (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 Author: Nils Philippsen <nils(a)redhat.com> Date: Thu Apr 21 13:52:18 2011 +0200 file-pdf-load: Use better API + cleanups * fixes issues with poppler 0.17 completely * uses new libgimp API to pass surfaces instead of pixbufs * uses GTK+ 3 API to convert surfaces to pixbufs where available (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) commit 4e92302c4a14a961f112587a0ad86696c88da2f8 Author: Nils Philippsen <nils(a)redhat.com> Date: Thu Apr 21 13:38:08 2011 +0200 file-pdf-load: Don't use deprecated API (bug #646947) (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) Conflicts: plug-ins/common/file-pdf.c --- plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 283 insertions(+), 40 deletions(-) diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c index a43b459..43c2b7d 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf.c @@ -4,6 +4,9 @@ * * Copyright (C) 2005 Nathan Summers * + * Some code in render_page_to_surface() borrowed from + * poppler.git/glib/poppler-page.cc. + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, static PopplerDocument * open_document (const gchar *filename, GError **error); -static GdkPixbuf * get_thumbnail (PopplerDocument *doc, +static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, + gint page, + gint preferred_size); + +static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, gint page, gint preferred_size); static gint32 layer_from_pixbuf (gint32 image, - const gchar *layer_name, - gint position, - GdkPixbuf *buf, - gdouble progress_start, - gdouble progress_scale); + const gchar *layer_name, + gint position, + GdkPixbuf *pixbuf, + gdouble progress_start, + gdouble progress_scale); /** ** the following was formerly part of @@ -433,11 +440,12 @@ run (const gchar *name, } else { - gdouble width = 0; - gdouble height = 0; - gdouble scale; - gint32 image = -1; - GdkPixbuf *pixbuf = NULL; + gdouble width = 0; + gdouble height = 0; + gdouble scale; + gint32 image = -1; + gint num_pages = 0; + GdkPixbuf *pixbuf = NULL; /* Possibly retrieve last settings */ gimp_get_data (LOAD_PROC, &loadvals); @@ -455,7 +463,10 @@ run (const gchar *name, g_object_unref (page); } - pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); + num_pages = poppler_document_get_n_pages (doc); + + pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); + g_object_unref (doc); } @@ -548,6 +559,187 @@ open_document (const gchar *filename, return doc; } +/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ + +#if (!GTK_CHECK_VERSION (3, 0, 0)) + +static cairo_format_t +gdk_cairo_format_for_content (cairo_content_t content) +{ + switch (content) + { + case CAIRO_CONTENT_COLOR: + return CAIRO_FORMAT_RGB24; + case CAIRO_CONTENT_ALPHA: + return CAIRO_FORMAT_A8; + case CAIRO_CONTENT_COLOR_ALPHA: + default: + return CAIRO_FORMAT_ARGB32; + } +} + +static cairo_surface_t * +gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, + cairo_content_t content, + int src_x, + int src_y, + int width, + int height) +{ + cairo_surface_t *copy; + cairo_t *cr; + + copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), + width, + height); + + cr = cairo_create (copy); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_surface (cr, surface, -src_x, -src_y); + cairo_paint (cr); + cairo_destroy (cr); + + return copy; +} + +static void +convert_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + guint alpha = src[x] >> 24; + + if (alpha == 0) + { + dest_data[x * 4 + 0] = 0; + dest_data[x * 4 + 1] = 0; + dest_data[x * 4 + 2] = 0; + } + else + { + dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; + } + dest_data[x * 4 + 3] = alpha; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +static void +convert_no_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + dest_data[x * 3 + 0] = src[x] >> 16; + dest_data[x * 3 + 1] = src[x] >> 8; + dest_data[x * 3 + 2] = src[x]; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +/** + * gdk_pixbuf_get_from_surface: + * @surface: surface to copy from + * @src_x: Source X coordinate within @surface + * @src_y: Source Y coordinate within @surface + * @width: Width in pixels of region to get + * @height: Height in pixels of region to get + * + * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) + * representation inside a #GdkPixbuf. This allows you to efficiently read + * individual pixels from cairo surfaces. For #GdkWindows, use + * gdk_pixbuf_get_from_window() instead. + * + * This function will create an RGB pixbuf with 8 bits per channel. + * The pixbuf will contain an alpha channel if the @surface contains one. + * + * Return value: (transfer full): A newly-created pixbuf with a reference + * count of 1, or %NULL on error + */ +static GdkPixbuf * +gdk_pixbuf_get_from_surface (cairo_surface_t *surface, + gint src_x, + gint src_y, + gint width, + gint height) +{ + cairo_content_t content; + GdkPixbuf *dest; + + /* General sanity checks */ + g_return_val_if_fail (surface != NULL, NULL); + g_return_val_if_fail (width > 0 && height > 0, NULL); + + content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + !!(content & CAIRO_CONTENT_ALPHA), + 8, + width, height); + + surface = gdk_cairo_surface_coerce_to_image (surface, content, + src_x, src_y, + width, height); + cairo_surface_flush (surface); + if (cairo_surface_status (surface) || dest == NULL) + { + cairo_surface_destroy (surface); + return NULL; + } + + if (gdk_pixbuf_get_has_alpha (dest)) + convert_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + 0, 0, + width, height); + else + convert_no_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + 0, 0, + width, height); + + cairo_surface_destroy (surface); + return dest; +} + +#endif + static gint32 layer_from_pixbuf (gint32 image, const gchar *layer_name, @@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, return layer; } +static cairo_surface_t * +render_page_to_surface (PopplerPage *page, + int width, + int height, + double scale) +{ + cairo_surface_t *surface; + cairo_t *cr; + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create (surface); + + cairo_save (cr); + cairo_translate (cr, 0.0, 0.0); + + if (scale != 1.0) + cairo_scale (cr, scale, scale); + + poppler_page_render (page, cr); + cairo_restore (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_paint (cr); + + cairo_destroy (cr); + + return surface; +} + +static GdkPixbuf * +render_page_to_pixbuf (PopplerPage *page, + int width, + int height, + double scale) +{ + GdkPixbuf *pixbuf; + cairo_surface_t *surface; + + surface = render_page_to_surface (page, width, height, scale); + pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, + cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface)); + cairo_surface_destroy (surface); + + return pixbuf; +} + static gint32 load_image (PopplerDocument *doc, const gchar *filename, @@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, gdouble page_width; gdouble page_height; - GdkPixbuf *buf; + GdkPixbuf *pixbuf; gint width; gint height; @@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, gimp_image_set_resolution (image_ID, resolution, resolution); } - buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); - - poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); + pixbuf = render_page_to_pixbuf (page, width, height, scale); - layer_from_pixbuf (image_ID, page_label, i, buf, + layer_from_pixbuf (image_ID, page_label, i, pixbuf, doc_progress, 1.0 / pages->n_pages); g_free (page_label); - g_object_unref (buf); + g_object_unref(pixbuf); doc_progress = (double) (i + 1) / pages->n_pages; gimp_progress_update (doc_progress); @@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, return image_ID; } -static GdkPixbuf * -get_thumbnail (PopplerDocument *doc, - gint page_num, - gint preferred_size) +static cairo_surface_t * +get_thumb_surface (PopplerDocument *doc, + gint page_num, + gint preferred_size) { PopplerPage *page; - GdkPixbuf *pixbuf; + cairo_surface_t *surface; page = poppler_document_get_page (doc, page_num); if (! page) return NULL; - /* XXX: Remove conditional when we depend on poppler 0.8.0, but also - * add configure check to make sure POPPLER_WITH_GDK is enabled! - */ -#ifdef POPPLER_WITH_GDK - pixbuf = poppler_page_get_thumbnail_pixbuf (page); -#else - pixbuf = poppler_page_get_thumbnail (page); -#endif - + surface = poppler_page_get_thumbnail (page); - if (! pixbuf) + if (! surface) { gdouble width; gdouble height; @@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, width *= scale; height *= scale; - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, - width, height); - - poppler_page_render_to_pixbuf (page, - 0, 0, width, height, scale, 0, pixbuf); + surface = render_page_to_surface (page, width, height, scale); } g_object_unref (page); + return surface; +} + +static GdkPixbuf * +get_thumb_pixbuf (PopplerDocument *doc, + gint page_num, + gint preferred_size) +{ + cairo_surface_t *surface; + GdkPixbuf *pixbuf; + + surface = get_thumb_surface (doc, page_num, preferred_size); + pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, + cairo_image_surface_get_width (surface), + cairo_image_surface_get_height (surface)); + cairo_surface_destroy (surface); + return pixbuf; } @@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) idle_data->page_no = i; /* FIXME get preferred size from somewhere? */ - idle_data->pixbuf = get_thumbnail (thread_data->document, i, - THUMBNAIL_SIZE); + idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, + THUMBNAIL_SIZE); g_idle_add (idle_set_thumbnail, idle_data); -- 1.7.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0