Hello community, here is the log from the commit of package gimp checked in at Tue Jan 9 17:44:19 CET 2007. -------- --- GNOME/gimp/gimp.changes 2006-12-05 14:23:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/gimp/gimp.changes 2007-01-03 14:34:41.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 3 14:34:24 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- +Fri Dec 22 17:24:03 CST 2006 - maw@suse.de + +- Move to /usr. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.y16659/_old 2007-01-09 17:44:02.000000000 +0100 +++ /var/tmp/diff_new_pack.y16659/_new 2007-01-09 17:44:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gimp (Version 2.2.13) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,17 +12,15 @@ Name: gimp #!BuildIgnore: sendmail -BuildRequires: aalib-devel alsa-devel cups cups-devel gcc-c++ gnome-common gtkdoc intltool libexif libgimpprint libgimpprint-devel libgtkhtml-devel libmng-devel librsvg-devel libtiff-devel libwmf-devel perl-XML-Parser postfix python-devel slang-devel update-desktop-files +BuildRequires: aalib-devel alsa-devel cups cups-devel gcc-c++ gnome-common gtk-doc intltool libexif libgimpprint libgimpprint-devel libgtkhtml-devel libmng-devel librsvg-devel libtiff-devel libwmf-devel perl-XML-Parser postfix python-devel slang-devel update-desktop-files %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: python-gtk-devel %else BuildRequires: python-gtk %endif URL: http://www.gimp.org/ -%define sysconfdir /etc -%define prefix /opt/gnome Version: 2.2.13 -Release: 29 +Release: 40 License: GNU General Public License (GPL) Group: Productivity/Graphics/Bitmap Editors Provides: gimp2 gimp-2.0 @@ -237,11 +235,9 @@ %package devel Summary: GIMP Plugin and Extension Development Kit Provides: gimp2-devel gimp-2.0-devel -Requires: gimp = %{version} -Requires: gtk2-devel glib2-devel glibc-devel +Requires: %{name} = %{version} gtk2-devel glib2-devel glibc-devel Obsoletes: gimpdev libgimpd gimp2-devel Group: Development/Libraries/GNOME -Autoreqprov: on %description devel Install gimp-devel if you're going to create plug-ins and/or extensions @@ -421,6 +417,209 @@ Matthew Wilson Shirasaki Yasuhiro +%package doc +Summary: Additional Package Documentation. +Provides: gimp2-doc gimp-2.0-doc +Requires: %{name} = %{version} +Obsoletes: gimpdev libgimpd gimp2-devel +Group: Productivity/Graphics/Bitmap Editors + +%description doc +The GIMP (GNU Image Manipulation Program) is a powerful image +composition and editing program, which can be extremely useful for +creating logos and other graphics for Web pages. The GIMP has many of +the tools and filters you would expect to find in similar commercial +offerings and some interesting extras as well. The GIMP provides a +large image manipulation toolbox, including channel operations and +layers, effects, subpixel imaging and antialiasing, and conversions, +all with multilevel undo. + +The GIMP includes a scripting facility, but many of the included +scripts rely on fonts that we cannot distribute. The GIMP FTP site has +a package of fonts that you can install by yourself, which includes all +the fonts needed to run the included scripts. Some of the fonts have +unusual licensing requirements; all the licenses are documented in the +package. Get ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz +and ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz if you are +so inclined. Alternatively, choose fonts which exist on your system +before running the scripts. + +Install the GIMP if you need a powerful image manipulation program. + + + +Authors: +-------- + Spencer Kimball + Peter Mattis + Lauri Alanko + Shawn Amundson + Sven Anders + Karl-Johan Andersson + John Beale + Zach Beane + Tom Bech + Marc Bless + Edward Blevins + Reagan Blundell + Xavier Bouchoux + Roberto Boyd + Stanislav Brabec + Robert Brady + Hans Breuer + Simon Budig + Carey Bunks + Seth Burgess + Brent Burton + Francisco Bustamante + Albert Cahalan + Sean Cier + Winston Chang + Kenneth Christiansen + Zbigniew Chyla + Ed Connel + Piers Cornwell + Daniel Cotting + Jay Cox + Brian Degenhardt + Gert Dewit + Andreas Dilger + Austin Donnelly + Scott Draves + Daniel Dunbar + Misha Dynin + Daniel Egger + Morton Eriksen + Larry Ewing + Nick Fetchak + Valek Filippov + David Forsyth + Raphael Francois + Jochen Friedrich + Sami Gerdt + Jim Geuther + Graeme Gill + Scott Goehring + Heiko Goller + Marcelo de Gomensoro Malheiros + Pavel Grinfeld + Michael Hammel + Henrik Hansen + Ville Hautamaki + James Henstridge + Eric Hernes + David Hodson + Christoph Hoegl + Wolfgang Hofer + Jan Hubicka + Andreas Hyden + Ben Jackson + Krzysztof Jakubowski + Simon Janes + Tim Janik + Fellmann Joaquim + Andrew Kieschnick + Peter Kirchgessner + Philipp Klaus + David Koblas + Robert L Krawitz + Tuomas Kuosmanen + Karin Kylander + Olof S Kylander + Karl La Rocca + Chris Lahey + Nick Lamb + Marco Lamberto + Jens Lautenbacher + Laramie Leavitt + Elliot Lee + Marc Lehmann + Ray Lehtiniemi + Raph Levien + Wing Tung Leung + Adrian Likins + Tor Lillqvist + Ingo Luetkebohle + Josh MacDonald + Ed Mackey + Vidar Madsen + Ian Main + Kjartan Maraas + Kelly Martin + Torsten Martinsen + Gordon Matzigkeit + Gregory McLean + Daniele Medri + Federico Mena Quintero + James Mitchell + Hirotsuna Mizuno + David Monniaux + Adam D Moss + Balazs Nagy + Yukihiro Nakai + Sung-Hyun Nam + Shuji Narazaki + Felix Natter + Michael Natterer + David Neary + Sven Neumann + Stephen Robert Norris + Tim Newsome + Erik Nygren + Miles O'Neal + David Neary + David Necas + David Odin + Thom van Os + Garry R. Osgood + Alan Paeth + Jay Painter + Sergey Panov + Ville Patsi + Asbjorn Pettersen + Mike Phillips + Artur Polaczynski + Raphael Quinet + Tom Rathborne + Vincent Renardias + Jens Restemeier + Maurits Rijk + Daniel Risacher + James Robinson + Guillermo S. Romero + Tim Rowley + Pablo Saratxaga + Mike Schaeffer + John Schlag + Norbert Schmitz + Thorsten Schnier + Alexander Schulz + Tracy Scott + Craig Setera + Aaron Sherman + Manish Singh + Daniel Skarda + Adam Spiers + Jakub Steiner + Nathan Summers + Mike Sweet + Yuri Syrota + Eiichi Takamori + Tristan Tarrant + Michael Taylor + Owen Taylor + Ian Tester + Andy Thomas + Kevin Turner + Rebecca Walter + Martin Weber + James Wang + Kris Wehner + Nigel Wetten + Calvin Williamson + Matthew Wilson + Shirasaki Yasuhiro + %prep %setup -q # We can ignore these warnings: @@ -440,11 +639,8 @@ #aclocal #automake autoconf -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --mandir=%{_mandir} \ - --sysconfdir=%{sysconfdir} \ +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure \ %ifarch %ix86 --enable-mmx \ --enable-sse \ @@ -452,38 +648,38 @@ --enable-mp \ --enable-python %ifarch %ix86 -cd app/composite -# FIXME: -# gimp-composite-mmx.c: In function 'gimp_composite_burn_rgba8_rgba8_rgba8_mmx': -# gimp-composite-mmx.c:148: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' -# gimp-composite-sse.c: In function 'gimp_composite_burn_rgba8_rgba8_rgba8_sse': -# gimp-composite-sse.c:127: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' -make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -O0" \ - libcompositemmx.a libcompositesse.a -cd ../.. +#cd app/composite +## FIXME: +## gimp-composite-mmx.c: In function 'gimp_composite_burn_rgba8_rgba8_rgba8_mmx': +## gimp-composite-mmx.c:148: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' +## gimp-composite-sse.c: In function 'gimp_composite_burn_rgba8_rgba8_rgba8_sse': +## gimp-composite-sse.c:127: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' +#make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -O0" \ +# libcompositemmx.a libcompositesse.a +#cd ../.. %endif make %{?jobs:-j %jobs} %install make install DESTDIR=$RPM_BUILD_ROOT -cp -a %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/%{prefix}/share/gimp/2.0/images/ +cp -a %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/gimp/2.0/images/ rm -rf $RPM_BUILD_ROOT/root -mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/applications -ln $RPM_BUILD_ROOT/%{prefix}/share/gimp/2.0/misc/gimp.desktop \ - $RPM_BUILD_ROOT/%{prefix}/share/applications/gimp.desktop -mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/application-registry -ln $RPM_BUILD_ROOT/%{prefix}/share/gimp/2.0/misc/gimp.applications \ - $RPM_BUILD_ROOT/%{prefix}/share/application-registry/gimp.applications -mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/mime-info -ln $RPM_BUILD_ROOT/%{prefix}/share/gimp/2.0/misc/gimp.keys \ - $RPM_BUILD_ROOT/%{prefix}/share/mime-info/gimp.keys +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +ln $RPM_BUILD_ROOT/%{_datadir}/gimp/2.0/misc/gimp.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/gimp.desktop +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/application-registry +ln $RPM_BUILD_ROOT/%{_datadir}/gimp/2.0/misc/gimp.applications \ + $RPM_BUILD_ROOT/%{_datadir}/application-registry/gimp.applications +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info +ln $RPM_BUILD_ROOT/%{_datadir}/gimp/2.0/misc/gimp.keys \ + $RPM_BUILD_ROOT/%{_datadir}/mime-info/gimp.keys %suse_update_desktop_file gimp Graphics RasterGraphics -rm $RPM_BUILD_ROOT%{prefix}/%_lib/gimp/2.0/modules/*.*a +rm $RPM_BUILD_ROOT/%{_libdir}/gimp/2.0/modules/*.*a +rm $RPM_BUILD_ROOT/%{_datadir}/application-registry/gimp.applications $RPM_BUILD_ROOT/%{_datadir}/mime-info/gimp.keys %find_lang gimp20 -%find_lang gimp20-libgimp -%find_lang gimp20-script-fu -%find_lang gimp20-std-plug-ins -cat gimp20.lang gimp20-libgimp.lang gimp20-script-fu.lang gimp20-std-plug-ins.lang >%{name}-all.lang +%find_lang gimp20-libgimp gimp20.lang +%find_lang gimp20-script-fu gimp20.lang +%find_lang gimp20-std-plug-ins gimp20.lang %post %run_ldconfig @@ -494,40 +690,37 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}-all.lang +%files -f gimp20.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog* NEWS* README* -%dir %{sysconfdir}/gimp -%{sysconfdir}/gimp/2.0 -%{prefix}/bin/gimp -%{prefix}/bin/gimp-* -%{prefix}/%_lib/*.so.* -%dir %{prefix}/%_lib/gimp -%dir %{prefix}/%_lib/gimp/2.0 -%dir %{prefix}/%_lib/gimp/2.0/modules -%{prefix}/%_lib/gimp/2.0/environ -%{prefix}/%_lib/gimp/2.0/plug-ins -%{prefix}/%_lib/gimp/2.0/python -%{prefix}/%_lib/gimp/2.0/modules/*.so -%{prefix}/share/application-registry/gimp.applications -%{prefix}/share/applications/gimp.desktop -%{prefix}/share/mime-info/gimp.keys -%dir %{prefix}/share/gimp -%{prefix}/share/gimp/2.0 -%doc /usr/share/man/man*/*.* +%{_datadir}/applications/gimp.desktop +%{_datadir}/gimp +%{_datadir}/gimp/2.0 +%{_bindir}/gimp +%{_bindir}/gimp-* +%{_libdir}/*.so.* +%{_libdir}/gimp +%doc %{_mandir}/man?/*.* +%{_sysconfdir}/gimp %files devel %defattr(-,root,root) -%{prefix}/bin/gimptool* -%{prefix}/include/* -%{prefix}/%_lib/*.*a -%{prefix}/%_lib/*.so -#%{prefix}/%_lib/gimp/2.0/modules/*.*a -%{prefix}/%_lib/pkgconfig/*.pc -%{prefix}/share/aclocal/*.m4 -%{prefix}/share/gtk-doc/html/* +%{_bindir}/gimptool* +%{_includedir}/* +%{_libdir}/*.*a +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%{_datadir}/aclocal/*.m4 + +%files doc +%defattr(-,root,root) +%{_datadir}/gtk-doc/html/* %changelog -n gimp +* Wed Jan 03 2007 - sbrabec@suse.cz +- Spec file cleanup. +* Fri Dec 22 2006 - maw@suse.de +- Move to /usr. * Tue Dec 05 2006 - sbrabec@suse.cz - Build correctly in Build Service. * Thu Nov 23 2006 - sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org