packages: seahorse-plugins/seahorse-plugins.spec - proper directory for nau...

[lisu]

Author: lisu                         Date: Thu Apr 21 14:22:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- proper directory for nautilus extension
- comment out gedit-plugins-seahorse for now
- use __rm acors

---- Files affected:
packages/seahorse-plugins:
   seahorse-plugins.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/seahorse-plugins/seahorse-plugins.spec
diff -u packages/seahorse-plugins/seahorse-plugins.spec:1.17 packages/seahorse-plugins/seahorse-plugins.spec:1.18
--- packages/seahorse-plugins/seahorse-plugins.spec:1.17	Fri Apr  8 11:19:15 2011
+++ packages/seahorse-plugins/seahorse-plugins.spec	Thu Apr 21 16:22:07 2011
@@ -19,14 +19,14 @@
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	evolution-data-server-devel >= 2.26.0
+BuildRequires:	evolution-data-server-devel >= 3.0.0
 BuildRequires:	gedit2-devel >= 2.24.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-doc-utils >= 0.14.0
 BuildRequires:	gnome-panel-devel >= 2.26.0
 BuildRequires:	gnupg >= 1.4.5
 BuildRequires:	gpgme-devel >= 1:1.1.2
-BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gtk+2-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libcryptui-devel >= 2.30.1
 BuildRequires:	libgnome-keyring-devel >= 2.26.0
@@ -123,9 +123,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/2.*/extensions/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/epiphany/2.*/extensions/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la}
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
@@ -179,13 +179,13 @@
 
 %files -n gedit-plugin-seahorse
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gedit-2/plugins/libseahorse-pgp.so
-%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
-%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas
+#%%attr(755,root,root) %{_libdir}/gedit-2/plugins/libseahorse-pgp.so
+#%%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
+#%%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas
 
 %files -n nautilus-extension-seahorse
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-seahorse.so
 %{_datadir}/mime/packages/seahorse.xml
 
 %files -n gnome-applet-seahorse -f seahorse-applet.lang
@@ -203,6 +203,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/04/21 14:22:07  lisu
+- proper directory for nautilus extension
+- comment out gedit-plugins-seahorse for now
+- use __rm acors
+
 Revision 1.17  2011/04/08 09:19:15  lisu
 - non integer release (see TODO)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seahorse-plugins/seahorse-plugins.spec?r1=1.17&r2=1.18&f=u