rpms/seahorse/devel .cvsignore, 1.7, 1.8 seahorse.spec, 1.23, 1.24 sources, 1.8, 1.9

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29574/devel

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
update to 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2006 04:32:01 -0000	1.7
+++ .cvsignore	26 Jun 2007 19:34:52 -0000	1.8
@@ -1 +1 @@
-seahorse-0.8.1.tar.gz
+seahorse-1.0.1.tar.gz


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- seahorse.spec	26 Feb 2007 17:33:23 -0000	1.23
+++ seahorse.spec	26 Jun 2007 19:34:52 -0000	1.24
@@ -1,153 +1,153 @@
 Name: 		seahorse
-Version: 	0.8.2
-Release:    	2%{?dist}
-Summary:	GNOME interface for gnupg
+Version: 	1.0.1
+Release:        2%{?dist}
+Summary:	GNOME2 interface for gnupg
 Group: 		User Interface/Desktops
 License: 	GPL
-URL:        	http://seahorse.sourceforge.net/
-Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
+URL:            http://seahorse.sourceforge.net/
+Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  eel2-devel
-#BuildRequires:  gedit-devel
+BuildRequires:  gedit-devel
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
-BuildRequires:  perl-XML-Parser
+BuildRequires:  gnupg
+BuildRequires:  libgnome-devel
+BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  nautilus-devel
 BuildRequires:  libsoup-devel
-BuildRequires: 	openldap-devel
-
-Requires(pre): GConf2
+BuildRequires:  openldap-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  perl-XML-Parser
+Requires(post): desktop-file-utils
 Requires(post): GConf2
-Requires(preun): GConf2
 Requires(post): scrollkeeper
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
-
+Requires(postun): shared-mime-info
 
 %description
-Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
+Seahorse is a gnome2 interface for gnupg.
+It uses gpgme as the backend.
 
 
 %prep
 %setup -q
-
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
+sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
 
 %build
-%configure --disable-schemas-install --disable-static --disable-update-mime-database --disable-gedit
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+%makeinstall
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+%find_lang seahorse
+
+# get rid of the cryptui-devel stuff until we figure out whast do with it later
+rm -rf ${RPM_BUILD_ROOT}/usr/include/libcryptui
+rm -rf ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/cryptui-0.0.pc
+
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
+  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category GNOME                                  \
   --add-category Utility                                \
+  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
 
+# nuke the icon cache
+rm -f ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/icon-theme.cache
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	#SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
-	SCHEMAS="seahorse.schemas"
-	for i in $SCHEMAS; do
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
-	done
-fi
-
-
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
-SCHEMAS="seahorse.schemas"
-for i in $SCHEMAS; do
-	gconftool-2 --makefile-install-rule \
-		%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
-done
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null ||:
-
-
-%preun
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	#SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
-	SCHEMAS="seahorse.schemas"
-	for i in $SCHEMAS; do
-		gconftool-2 --makefile-uninstall-rule \
-			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
-	done   
+gconftool-2 \
+     --makefile-install-rule \
+     %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q ||:
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
+
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+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
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
-%{_datadir}/%{name}/
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/control-center-2.0/capplets/*.desktop
-%{_datadir}/gnome/help/%{name}/
-%{_datadir}/mime-info/seahorse.keys
-%{_datadir}/mime-info/seahorse.mime
+%dir %{_datadir}/gnome/help/%{name}
+%{_datadir}/gnome/help/%{name}/*
+%{_datadir}/gnome/help/%{name}-applet/*
 %{_datadir}/mime/packages/*
-%{_datadir}/omf/%{name}/
+%{_datadir}/icons/*
+%dir %{_datadir}/omf/%{name}
+%{_datadir}/omf/%{name}/*
+%dir %{_datadir}/omf/%{name}-applet
+%{_datadir}/omf/%{name}-applet/*
 %{_datadir}/pixmaps/*
-%{_libdir}/libseahorse-internal*
-#%{_libdir}/gedit-2/plugins/*
+%{_mandir}/man1/*.gz
+%dir %{_libdir}/seahorse
+%{_libdir}/seahorse/*
+%{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml
+%{_libdir}/libcryptui*
+%{_libdir}/gedit-2/plugins/*
 %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so
 %{_sysconfdir}/gconf/schemas/*
+%{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server
+%{_datadir}/dbus-1/services/org.gnome.seahorse.service
 
 
 %changelog
-* Tue Feb 26 2007 Seth Vidal <skvidal at fedoraproject.org> - 0.8.2-2
-- disable gedit to make it work on rawhide
-
-* Tue Nov 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.8.2-1
-- Update to 0.8.2.
-- Minor tweak to summary & description.
-- Drop BR on libgnomeui-devel, since eel2-devel pulls this in.
-- Use -disable-update-mime-database instead of editing makefiles.
-- Update scriptlets, and adjust Requires to follow wiki guidelines.
-- Remove X-Fedora category from desktop files.
-- Don't bother building static libs.
-- Remove unnecessary disabling of schemas in install section.
-
-* Mon Aug 28 2006 Seth Vidal <skvidal at linux.duke.edu>
-- rebuild
+* Tue Jun 26 2007 Seth Vidal <skvidal at fedoraproject.org>
+- update to 1.0.1
 
 * Sun Aug 13 2006 Seth Vidal <skvidal at linux.duke.edu>
 - re-enable gedit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Jan 2007 20:23:50 -0000	1.8
+++ sources	26 Jun 2007 19:34:52 -0000	1.9
@@ -1 +1 @@
-ee7de41490edd7123de6e99880c34efd  seahorse-0.8.2.tar.gz
+50510a1fc0d5875788c070a26f55f8dd  seahorse-1.0.1.tar.gz