rpms/gimp/devel gimp.spec,1.122,1.123

[fedora-cvs-commits at redhat.com]

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
fix plugin symlinks handling better (#238337)
Resolves: #238337



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gimp.spec	30 Apr 2007 16:45:17 -0000	1.122
+++ gimp.spec	30 Apr 2007 19:37:26 -0000	1.123
@@ -43,7 +43,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -269,16 +269,24 @@
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+%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
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
-%{_sbindir}/gimp-plugin-mgr --uninstall '*'
+# 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
@@ -413,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-4
+- fix plugin symlinks handling better (#238337)
+
 * Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-3
 - don't erroneously delete symlinks to external plugins when updating (#238337)