rpms/gimp/FC-3 .cvsignore, 1.17, 1.18 gimp.spec, 1.48, 1.49 sources, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gimp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv23753

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Feb 2005 09:44:56 -0000	1.17
+++ .cvsignore	11 Apr 2005 11:32:20 -0000	1.18
@@ -1 +1 @@
-gimp-2.2.4.tar.bz2
+gimp-2.2.6.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/gimp.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gimp.spec	11 Mar 2005 08:08:09 -0000	1.48
+++ gimp.spec	11 Apr 2005 11:32:20 -0000	1.49
@@ -6,7 +6,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.4
+Version: 	2.2.6
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -14,7 +14,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	0.fc3.%{?prever:0.0.%{prever}.}4
+Release: 	0.fc3.%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -163,9 +163,12 @@
 
 %if %_enable_convenience
 # install convenience symlinks
-[ ! -L %{buildroot}/%{_bindir}/gimp ] && ln -s gimp-%{binver} %{buildroot}/%{_bindir}/gimp
-[ ! -L %{buildroot}/%{_bindir}/gimp-remote ] && ln -s gimp-remote-%{binver} %{buildroot}/%{_bindir}/gimp-remote
-[ ! -L %{buildroot}/%{_bindir}/gimptool ] && ln -s gimptool-%{interfacever} %{buildroot}/%{_bindir}/gimptool
+ln -snf gimp-%{binver} %{buildroot}/%{_bindir}/gimp
+ln -snf gimp-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp.1
+ln -snf gimp-remote-%{binver} %{buildroot}/%{_bindir}/gimp-remote
+ln -snf gimp-remote-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-remote.1
+ln -snf gimptool-%{interfacever} %{buildroot}/%{_bindir}/gimptool
+ln -snf gimptool-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimptool.5
 %endif
 
 %clean
@@ -177,6 +180,10 @@
 if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
     %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever}
 fi
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache %{_datadir}/icons/hicolor
+fi
 
 %preun
 # Do this always, because interfacever could be different
@@ -189,6 +196,10 @@
 if [ "$1" = "0" ]; then
     /usr/bin/update-desktop-database %{_datadir}/applications
 fi
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache %{_datadir}/icons/hicolor
+fi
 
 %files -f gimp.files
 %defattr(-, root, root, 0755)
@@ -302,7 +313,25 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Mar 11 2004 Nils Philippsen <nphilipp at redhat.com>
+* Mon Apr 11 2005 Nils Philippsen <nphilipp at redhat.com>
+- version 2.2.6
+
+* Tue Mar 29 2005 Nils Philippsen <nphilipp at redhat.com>
+- revert gtk requirement change
+
+* Mon Mar 28 2005 Matthias Clasen <mclasen at redhat.com>
+- Rebuild against newer libexif
+
+* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
+- rebuilt
+
+* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com>
+- Update the GTK+ theme icon cache on (un)install
+
+* Tue Mar 22 2005 Nils Philippsen <nphilipp at redhat.com>
+- install convenience symlinks for man pages
+
+* Fri Mar 11 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't refer to freefonts and sharefonts in %%description
 
 * Wed Mar 09 2005 Nils Philippsen <nphilipp at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Feb 2005 09:44:56 -0000	1.17
+++ sources	11 Apr 2005 11:32:20 -0000	1.18
@@ -1 +1 @@
-99e2b9391e87f8930bc22e791c8342d8  gimp-2.2.4.tar.bz2
+cf7de255739bf5abc2e90d7882eda6c9  gimp-2.2.6.tar.bz2