rpms/seahorse-plugins/devel .cvsignore, 1.2, 1.3 seahorse-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Log Message:
2.23.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Aug 2008 02:00:44 -0000	1.2
+++ .cvsignore	4 Sep 2008 06:10:59 -0000	1.3
@@ -1 +1 @@
-seahorse-plugins-2.23.6.tar.bz2
+seahorse-plugins-2.23.91.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seahorse-plugins.spec	25 Aug 2008 01:03:37 -0000	1.2
+++ seahorse-plugins.spec	4 Sep 2008 06:10:59 -0000	1.3
@@ -1,16 +1,12 @@
 Name: 		seahorse-plugins
-Version: 	2.23.6
-Release:        2%{?dist}
+Version: 	2.23.91
+Release:        1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
 URL:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse-plugins/2.23/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
-# gettext domain conflict, reported on the upstream mailinglist
-Patch0:		gettext-domain.patch
-# check for epiphany 2.23, reported on the upstream mailinglist
-Patch1: 	epiphany-2.23.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +60,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext-domain
-%patch1 -p1 -b .epiphany-2.23
 
 autoreconf
 
@@ -95,17 +89,6 @@
 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
@@ -119,6 +102,11 @@
 	%{_sysconfdir}/gconf/schemas/seahorse-plugins.schemas 	\
 	%{_sysconfdir}/gconf/schemas/seahorse-gedit.schemas 	\
 	>& /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
+
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -142,6 +130,10 @@
 %postun
 scrollkeeper-update -q
 update-mime-database %{_datadir}/mime >& /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
 
 
 %files -f %{name}.lang
@@ -167,12 +159,21 @@
 %{_datadir}/applications/seahorse-pgp-signature.desktop
 %{_datadir}/mime/packages/seahorse.xml
 %{_datadir}/seahorse-plugins
-%{_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
+%{_datadir}/pixmaps/seahorse-applet.svg
+%{_datadir}/pixmaps/seahorse/22x22/*
+%{_datadir}/pixmaps/seahorse/48x48/*
+%{_datadir}/pixmaps/seahorse/scalable/*
+%{_datadir}/icons/hicolor/48x48/apps/seahorse-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/seahorse-applet.svg
+
 
 %changelog
+* Thu Sep  4 2008 Matthias Clasen <mclasen at redhat.com> 2.23.91-1
+- Update to 2.23.91
+
 * Sun Aug 24 2008 Matthias Clasen <mclasen at redhat.com> 2.23.6-2
 - Brutally fix some file conflicts with the main seahorse package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Aug 2008 02:00:44 -0000	1.2
+++ sources	4 Sep 2008 06:10:59 -0000	1.3
@@ -1 +1 @@
-714f7749d0d586ba62180141098756a3  seahorse-plugins-2.23.6.tar.bz2
+585371c1302077894e514b6305c82acd  seahorse-plugins-2.23.91.tar.bz2