Hello community, here is the log from the commit of package gimp checked in at Thu Jun 15 15:07:57 CEST 2006. -------- --- GNOME/gimp/gimp.changes 2006-03-01 23:59:43.000000000 +0100 +++ gimp/gimp.changes 2006-06-14 19:09:56.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 14 18:21:17 CEST 2006 - schwab@suse.de + +- Handle references to datarootdir variable. +- Really enable python scripting. + +------------------------------------------------------------------- New: ---- gimp-gimpdatadir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.c1JLUl/_old 2006-06-15 15:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.c1JLUl/_new 2006-06-15 15:07:47.000000000 +0200 @@ -17,7 +17,7 @@ %define sysconfdir /etc %define prefix /opt/gnome Version: 2.2.10 -Release: 11 +Release: 22 License: GPL Group: Productivity/Graphics/Bitmap Editors Provides: gimp2 gimp-2.0 @@ -31,6 +31,7 @@ Source1: gimp-logo.png Source2: gimp-splash.png Patch: gimp-warnings.patch +Patch1: gimp-gimpdatadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -419,9 +420,9 @@ %prep %setup -q %patch +%patch1 rm po*/no.* -sed "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in > configure.in.tmp && \ - mv configure.in.tmp configure.in +sed -i "/ALL_LINGUAS=/s/ no / /" configure.in # This trick activates Digital Camera RAW opening, if dcraw-gnome and rawphoto are installed. sed -i "s@MimeType=.*@&image/x-dcraw;@" data/misc/gimp.desktop.in.in sed -i "s@mime_types=.*@&,image/x-dcraw@" data/misc/gimp.applications.in @@ -432,7 +433,7 @@ aclocal automake autoconf -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -O0" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ ./configure --prefix=%{prefix} \ --libdir=%{prefix}/%_lib \ --mandir=%{_mandir} \ @@ -443,25 +444,17 @@ %endif --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 libcompositemmx.a -make libcompositesse.a +make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -O0" \ + libcompositemmx.a libcompositesse.a cd ../.. -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --mandir=%{_mandir} \ - --sysconfdir=%{sysconfdir} \ -%ifarch %ix86 - --enable-mmx \ - --enable-sse \ %endif - --enable-mp make %{?jobs:-j %jobs} %install @@ -502,8 +495,8 @@ %dir %{prefix}/%_lib/gimp/2.0 %dir %{prefix}/%_lib/gimp/2.0/modules %{prefix}/%_lib/gimp/2.0/environ -%dir %{prefix}/%_lib/gimp/2.0/plug-ins -%{prefix}/%_lib/gimp/2.0/plug-ins/* +%{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 @@ -525,6 +518,9 @@ %{prefix}/share/gtk-doc/html/* %changelog -n gimp +* Wed Jun 14 2006 - schwab@suse.de +- Handle references to datarootdir variable. +- Really enable python scripting. * Wed Mar 01 2006 - dobey@suse.de - Update splash and logo images with new versions * Sun Feb 19 2006 - aj@suse.de ++++++ gimp-gimpdatadir.patch ++++++ --- data/misc/Makefile.am +++ data/misc/Makefile.am @@ -22,7 +22,7 @@ DISTCLEANFILES = gimp.desktop gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po) - sed -e 's|.[{]prefix[}]|${prefix}|' gimp.desktop.in > desktop-foo \ + sed -e 's|@GIMPDATADIR@|${gimpdatadir}|' gimp.desktop.in > desktop-foo \ && $(INTLTOOL_MERGE) $(top_srcdir)/po desktop-foo $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cachemake \ && rm -r desktop-foo --- data/misc/gimp.desktop.in.in +++ data/misc/gimp.desktop.in.in @@ -7,7 +7,7 @@ _Comment=Create and edit images or photographs Exec=gimp-remote-@GIMP_APP_VERSION@ %U TryExec=gimp-@GIMP_APP_VERSION@ -Icon=@gimpdatadir@/images/@GIMP_DESKTOP_ICON@ +Icon=@GIMPDATADIR@/images/@GIMP_DESKTOP_ICON@ Terminal=false Categories=Application;Graphics;2DGraphics;RasterGraphics; X-GNOME-Bugzilla-Bugzilla=GNOME --- gimp.pc.in +++ gimp.pc.in @@ -2,6 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ gimpdatadir=@gimpdatadir@ gimplibdir=@gimpplugindir@ --- gimptool-2.0.in +++ gimptool-2.0.in @@ -7,6 +7,7 @@ bindir=@bindir@ sbindir=@sbindir@ libexecdir=@libexecdir@ +datarootdir=@datarootdir@ datadir=@datadir@ sysconfdir=@sysconfdir@ sharedstatedir=@sharedstatedir@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org