rpms/seahorse-plugins/devel seahorse-plugins.spec,1.39,1.40

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/seahorse-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30743

Modified Files:
	seahorse-plugins.spec 
Log Message:
* Thu Jul 22 2010 Tomas Bzatek <tbzatek at redhat.com> 2.30.1-2
- Temporarily disable gedit extension



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- seahorse-plugins.spec	27 Apr 2010 14:13:55 -0000	1.39
+++ seahorse-plugins.spec	22 Jul 2010 14:32:41 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		seahorse-plugins
 Version:	2.30.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group:		User Interface/Desktops
 License:	GPLv2+ and GFDL
@@ -34,9 +34,10 @@ BuildRequires:  gnome-panel-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  evolution-data-server-devel
 BuildRequires:  autoconf, automake, libtool, gettext-devel, intltool
+BuildRequires:  rarian-compat
 
 Requires: seahorse >= 2.23.6
-Requires: gedit
+# Requires: gedit
 # Requires: epiphany
 Requires: GConf2
 Requires: shared-mime-info
@@ -103,14 +104,15 @@ update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule 				\
 	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
-	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
+# 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
 	>& /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in seahorse.schemas seahorse-plugins.schemas seahorse-gedit.schemas; do
+#  for f in seahorse.schemas seahorse-plugins.schemas seahorse-gedit.schemas; do
+  for f in seahorse.schemas seahorse-plugins.schemas; do
     if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
       gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/$f >& /dev/null || :
     fi
@@ -122,7 +124,7 @@ if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule 			\
 	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
-	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
+# 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
 	>& /dev/null || :
 fi
 
@@ -142,7 +144,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING NEWS README
 %{_sysconfdir}/X11/xinit/xinitrc.d/seahorse-agent.sh
 %{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas
-%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas
+# %{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas
 %{_bindir}/seahorse-agent
 %{_bindir}/seahorse-preferences
 %{_bindir}/seahorse-tool
@@ -163,10 +165,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/seahorse-applet.svg
 
 # gedit plugin
-%dir %{_libdir}/gedit-2
-%dir %{_libdir}/gedit-2/plugins
-%{_libdir}/gedit-2/plugins/libseahorse-pgp.so
-%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
+# %dir %{_libdir}/gedit-2
+# %dir %{_libdir}/gedit-2/plugins
+# %{_libdir}/gedit-2/plugins/libseahorse-pgp.so
+# %{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
 
 # nautilus extension
 %dir %{_libdir}/nautilus/extensions-2.0
@@ -180,6 +182,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
+* Thu Jul 22 2010 Tomas Bzatek <tbzatek at redhat.com> 2.30.1-2
+- Temporarily disable gedit extension
+
 * Tue Apr 27 2010 Tomas Bzatek <tbzatek at redhat.com> 2.30.1-1
 - Update to 2.30.1