rpms/gimp/F-12 import.log, NONE, 1.1 .cvsignore, 1.54, 1.55 gimp.spec, 1.201, 1.202 sources, 1.54, 1.55 gimp-2.6.8-gtk219.patch, 1.1, NONE gimp-2.6.8-indexed-pnm.patch, 1.1, NONE gimp-2.6.8-never-stack-trace-desktop.patch, 1.1, NONE gimp-plugin-mgr.in, 1.3, NONE

Nils Philippsen nphilipp at fedoraproject.org
Thu Jun 24 10:42:36 UTC 2010


Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20075/F-12

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	import.log 
Removed Files:
	gimp-2.6.8-gtk219.patch gimp-2.6.8-indexed-pnm.patch 
	gimp-2.6.8-never-stack-trace-desktop.patch gimp-plugin-mgr.in 
Log Message:
version 2.6.9
remove obsolete gtk219, never-stack-trace-desktop, indexed-pnm patches
don't manually provide "gimp-libs%{?_isa}" in gimp-libs
don't package %{_datadir}/gtk-doc/html, but dirs beneath
get rid of obsolete gimp-plugin-mgr



--- NEW FILE import.log ---
gimp-2_6_9-1_fc14:F-12:gimp-2.6.9-1.fc14.src.rpm:1277375050


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	18 Jun 2010 14:42:33 -0000	1.54
+++ .cvsignore	24 Jun 2010 10:42:35 -0000	1.55
@@ -1,2 +1,2 @@
-gimp-2.6.8.tar.bz2
-gimp-2.6.8-4-automake.patch.bz2
+gimp-2.6.9-1-automake.patch.bz2
+gimp-2.6.9.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/gimp.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- gimp.spec	18 Jun 2010 14:30:26 -0000	1.201
+++ gimp.spec	24 Jun 2010 10:42:36 -0000	1.202
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.8
-Release:        8%{?dist}
+Version:        2.6.9
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -117,7 +117,6 @@ Requires:       xdg-utils
 Requires:       gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
-Source1:        gimp-plugin-mgr.in
 # distro specific: use xdg-open instead of firefox as web browser
 Patch0:         gimp-2.6.2-xdg-open.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=559081
@@ -128,14 +127,8 @@ Patch1:         gimp-2.6.7-jpeg-units.pa
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
 # backport: fix building with "gold" linker
 Patch3:         gimp-2.6.8-gold.patch
-# backport: statusbar code needed for GTK+ >= 2.19.1 (#559726)
-Patch4:         gimp-2.6.8-gtk219.patch
-# distro-specific: add --stack-trace-mode=never to desktop file
-Patch5:         gimp-2.6.8-never-stack-trace-desktop.patch
-# backport: fix saving indexed PNM files (#605615)
-Patch6:         gimp-2.6.8-indexed-pnm.patch
 # Makefile.in files generated by Makefile.am changed in patches
-Patch10:        gimp-2.6.8-4-automake.patch.bz2
+Patch10:        gimp-2.6.9-1-automake.patch.bz2
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -150,7 +143,6 @@ with multi-level undo.
 Summary:        GIMP libraries
 Group:          System Environment/Libraries
 License:        LGPLv2+
-Provides:       gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libs
 The gimp-libs package contains shared libraries needed for the GNU Image
@@ -219,16 +211,9 @@ EOF
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
 %patch3 -p1 -b .gold
-%patch4 -p1 -b .gtk219
-%patch5 -p1 -b .never-stack-trace-desktop
-%patch6 -p1 -b .indexed-pnm
 %patch10 -p1 -b .automake
 
 %build
-# if [ ! -f configure ]; then
-#   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
-# fi
-
 # Use PIC/PIE because gimp is likely to deal with files coming from untrusted
 # sources
 CFLAGS='-fPIC %optflags -fno-strict-aliasing'
@@ -276,9 +261,6 @@ LDFLAGS='-pie'
 
 make %{?_smp_mflags}
 
-# convenience stuff for external plugins (e.g. xsane)
-sed -e 's|@GIMPPLUGINDIR@|%{_libdir}/gimp/%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
-
 %install
 rm -rf %{buildroot}
 
@@ -342,35 +324,15 @@ ln -snf gimptool-%{interfacever}.1 %{bui
 ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
 %endif
 
-# convenience stuff for external plugins (e.g. xsane)
-mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
-mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
-
 %clean
 rm -rf %{buildroot}
 
-%pre
-# First, remove old symlinks which are possibly in an old location (before a
-# major version update)
-if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
-    %{_sbindir}/gimp-plugin-mgr --uninstall '*' || :
-fi
-
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
-# Then re-add the symlinks
-%{_sbindir}/gimp-plugin-mgr --install '*' || :
-
-%preun
-# Only delete symlinks when uninstalling
-if [ "$1" = "0" ]; then
-    %{_sbindir}/gimp-plugin-mgr --uninstall '*' || :
-fi
 
 %postun
 if [ "$1" = "0" ]; then
@@ -419,7 +381,6 @@ fi
 %{_datadir}/gimp/%{interfacever}/themes/
 
 %dir %{_sysconfdir}/gimp
-%dir %{_sysconfdir}/gimp/plugins.d
 %dir %{_sysconfdir}/gimp/%{interfacever}
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc
@@ -433,7 +394,6 @@ fi
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimp-console-%{binver}
-%{_sbindir}/gimp-plugin-mgr
 
 %if %{with convenience}
 %{_bindir}/gimp
@@ -484,7 +444,7 @@ fi
 %endif
 %defattr (-, root, root, 0755)
 %doc HACKING README.i18n
-%doc %{_datadir}/gtk-doc/*
+%doc %{_datadir}/gtk-doc/html/*/
 
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
@@ -513,6 +473,65 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Wed Jun 23 2010 Nils Philippsen <nils at redhat.com> - 2:2.6.9-1
+- version 2.6.9
+
+  Overview of Changes from GIMP 2.6.8 to GIMP 2.6.9
+  =================================================
+
+  * Bugs fixed:
+
+   612618 - Font selection remains visible
+   622234 - gimp.desktop: image/x-psd in MimeTypes twice
+   622196 - Unportable test(1) construct in configure script
+   620604 - Description of "histogram" procedure is slightly inaccurate
+   541586 - Tool options not saved/loaded correctly?
+   614153 - Importing PDF files with long titles
+   600112 - blur-gauss-selective.exe crashes
+   599233 - Dialog of "Save as BMP" ignores changes which are not made
+            with a mous
+   565001 - Text-Tool crashes when edit a 2.4.2 version xcf
+   610478 - Layer preview suddenly stops getting updated
+   609026 - leaks shared memory
+   609056 - Exporting to Alias PIX format fails
+   608188 - a few strings in Save as... > Raw image data dialog are always
+            in English
+   604820 - GEGL Operation "path" crashes GIMP
+   603711 - Crashes when using path tool
+   607242 - GIMP 2.7.0 fails to build against libpng 1.4.0
+   606372 - Saving to .ppm fails on indexed colorspace
+   605237 - the "Antialiasing..." message in the progress bar does not show
+            translated
+   604508 - gimp-layer-new-from-visible should work from updated projection
+
+  * Updated and new translations:
+
+   Asturian (ast)
+   Basque (eu)
+   Burmese (my)
+   Catalan (ca)
+   Chinese (Hong Kong) (zh_HK)
+   Chinese (Taiwan) (zh_HK)
+   German (de)
+   Italian (it)
+   Latvian (lv)
+   Low German (nds)
+   Romanian (ro)
+   Simplified Chinese (zh_CN)
+   Slovenian (sl)
+   Ukrainian (uk)
+   Valencian (ca at valencia)
+
+- remove obsolete gtk219, never-stack-trace-desktop, indexed-pnm patches
+- don't manually provide "gimp-libs%%{?_isa}" in gimp-libs
+- don't package %%{_datadir}/gtk-doc/html, but dirs beneath
+
+* Wed Jun 23 2010 Nils Philippsen <nils at redhat.com> - 2:2.6.8-10
+- get rid of obsolete gimp-plugin-mgr
+
+* Tue Jun 22 2010 Matthias Clasen <mclasen at redhat.com> - 2:2.6.8-9
+- Rebuild against new poppler
+
 * Fri Jun 18 2010 Nils Philippsen <nils at redhat.com> - 2:2.6.8-8
 - backport fix for saving indexed PNM files (#605615)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	18 Jun 2010 14:42:33 -0000	1.54
+++ sources	24 Jun 2010 10:42:36 -0000	1.55
@@ -1,2 +1,2 @@
-a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2
-b6e5b83adbc9ed543c697149757a5545  gimp-2.6.8-4-automake.patch.bz2
+8bd70b4fb59eb79d0009e633db9e5098  gimp-2.6.9-1-automake.patch.bz2
+e5d0cc6f3ce127e51d7f3d3124b16a99  gimp-2.6.9.tar.bz2


--- gimp-2.6.8-gtk219.patch DELETED ---


--- gimp-2.6.8-indexed-pnm.patch DELETED ---


--- gimp-2.6.8-never-stack-trace-desktop.patch DELETED ---


--- gimp-plugin-mgr.in DELETED ---



More information about the scm-commits mailing list