rpms/gimp/devel gimp.spec,1.213,1.214 gimp-plugin-mgr.in,1.3,NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6639

Modified Files:
	gimp.spec 
Removed Files:
	gimp-plugin-mgr.in 
Log Message:
get rid of obsolete gimp-plugin-mgr
fix typos



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- gimp.spec	22 Jun 2010 14:52:37 -0000	1.213
+++ gimp.spec	23 Jun 2010 11:58:53 -0000	1.214
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation P
 Name:           gimp
 Epoch:          2
 Version:        2.6.8
-Release:        9%{?dist}
+Release:        10%{?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
@@ -276,9 +275,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 +338,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 +395,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 +408,6 @@ fi
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimp-console-%{binver}
-%{_sbindir}/gimp-plugin-mgr
 
 %if %{with convenience}
 %{_bindir}/gimp
@@ -513,8 +487,11 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
-* Tue Jun 22 2010 Matthias Clasen <mclasen at redhat.com> - 2:26.8-9
-- Rebuilda against new poppler
+* 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)


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