rpms/seahorse-plugins/devel seahorse-plugins.spec,1.1,1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12751

Modified Files:
	seahorse-plugins.spec 
Log Message:
fix file conflicts



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seahorse-plugins.spec	8 Aug 2008 02:00:44 -0000	1.1
+++ seahorse-plugins.spec	25 Aug 2008 01:03:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.23.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -95,6 +95,17 @@
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
+
+# Nuke these files since they are conflicting with the main seahorse
+# package. This is still being sorted out upstream.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/seahorse
+rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/seahorse
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+mv $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/seahorse.schemas \
+   $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -103,22 +114,18 @@
 %post
 scrollkeeper-update -q
 update-mime-database %{_datadir}/mime >& /dev/null
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule 				\
-	%{_sysconfdir}/gconf/schemas/seahorse.schemas 		\
+	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
-	> /dev/null || :
+	>& /dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in seahorse.schemas seahorse-gedit.schemas; do
+  for f in seahorse.schemas seahorse-plugins.schemas seahorse-gedit.schemas; do
     if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
-      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/$f > /dev/null || :
+      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/$f >& /dev/null || :
     fi
   done
 fi
@@ -127,25 +134,21 @@
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule 			\
-	%{_sysconfdir}/gconf/schemas/seahorse.schemas 		\
+	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
-	> /dev/null || :
+	>& /dev/null || :
 fi
 
 %postun
 scrollkeeper-update -q
 update-mime-database %{_datadir}/mime >& /dev/null
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README 
 %{_sysconfdir}/X11/xinit/xinitrc.d/seahorse-agent.sh
-%{_sysconfdir}/gconf/schemas/seahorse.schemas
+%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas
 %{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas
 %{_bindir}/seahorse-agent
 %{_bindir}/seahorse-preferences
@@ -163,18 +166,15 @@
 %{_datadir}/applications/seahorse-pgp-preferences.desktop
 %{_datadir}/applications/seahorse-pgp-signature.desktop
 %{_datadir}/mime/packages/seahorse.xml
-%{_datadir}/icons/hicolor/*/apps/seahorse-preferences.*
-%{_datadir}/icons/hicolor/*/apps/seahorse-applet.*
-%{_datadir}/icons/hicolor/*/apps/seahorse.*
-%{_datadir}/pixmaps/seahorse-preferences.png
-%{_datadir}/pixmaps/seahorse-applet.svg
-%{_datadir}/pixmaps/seahorse.png
-%{_datadir}/pixmaps/seahorse
 %{_datadir}/seahorse-plugins
-%{_datadir}/seahorse
+%{_datadir}/seahorse/glade/seahorse-agent-cache.glade
+%{_datadir}/seahorse/glade/seahorse-applet-preferences.glade
 %{_mandir}/man1/seahorse-agent.1.gz
 %{_mandir}/man1/seahorse-tool.1.gz
 
 %changelog
+* Sun Aug 24 2008 Matthias Clasen <mclasen at redhat.com> 2.23.6-2
+- Brutally fix some file conflicts with the main seahorse package
+
 * Tue Aug  5 2008 Matthias Clasen <mclasen at redhat.com> 2.23.6-1
 - Initial packaging