devel/seahorse .cvsignore, 1.2, 1.3 seahorse.spec, 1.6, 1.7 sources, 1.2, 1.3

Phillip Compton (pcompton) fedora-extras-commits at redhat.com
Tue Mar 8 02:16:05 UTC 2005


Author: pcompton

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

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
sync dev with FC3 seahorse



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/seahorse/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:20 -0000	1.2
+++ .cvsignore	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-seahorse-0.7.3.tar.gz
+seahorse-0.7.6.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/devel/seahorse/seahorse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- seahorse.spec	5 Mar 2005 19:28:28 -0000	1.6
+++ seahorse.spec	8 Mar 2005 02:16:03 -0000	1.7
@@ -1,79 +1,99 @@
-Name:		seahorse
-Version:	0.7.3
-Release:	5
+Name: 		seahorse
+Version: 	0.7.6
+Release: 	2
 Summary:	GNOME2 interface for gnupg
 
-Group:		User Interface/Desktops
-License:	GPL
-URL:		http://seahorse.sourceforge.net/
-Source:		http://download.sourceforge.net/seahorse/seahorse-0.7.3.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	libgnomeui-devel
-BuildRequires:	eel2-devel
-BuildRequires:	gpgme03-devel
-BuildRequires:	scrollkeeper
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-Requires(post):		GConf2 scrollkeeper
-Requires(postun):	scrollkeeper
+Group: 		User Interface/Desktops
+License: 	GPL
+URL:            http://seahorse.sourceforge.net/
+Source: 	http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.6.tar.bz2
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  eel2-devel
+BuildRequires:  gedit-devel
+BuildRequires:  gettext
+BuildRequires:  gpgme-devel >= 1.0
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  scrollkeeper
+Requires(post): desktop-file-utils
+Requires(post): 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 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
+%configure --disable-schemas-install 
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=${RPM_BUILD_ROOT}
+%makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang seahorse
 
 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                               \
-  --add-category Application                            \
+  ${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                                \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  --add-category X-Fedora                               \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
+
 
 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}
 
 
-
 %post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 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 || :
 
 
 %postun
+/sbin/ldconfig
 scrollkeeper-update -q ||:
-
+update-mime-database %{_datadir}/mime/ > /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -81,22 +101,27 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/control-center-2.0/capplets/*.desktop
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/mime-info/seahorse.keys
+%{_datadir}/mime-info/seahorse.mime
+%{_datadir}/mime/packages/*
 %{_datadir}/omf/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/%{name}
-%{_sysconfdir}/gconf/schemas/*
+%{_libdir}/libseahorse-internal.so.0.0.0
 %{_libdir}/bonobo/*.*
 %{_libdir}/bonobo/servers/Seahorse_PGP_File_Listener.server
-%{_datadir}/control-center-2.0/capplets/*.desktop
-%{_datadir}/mime-info/seahorse.keys
-%{_datadir}/mime-info/seahorse.mime
-
+%{_libdir}/gedit-2/plugins/*
+%{_sysconfdir}/gconf/schemas/*
 
 
 %changelog
-* Fri Mar  4 2005 Ville Skyttä <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-2
+- desktop entry fixes.
+
+* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-1
+- 0.7.6.
 
 * Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
 - BuildReq scrollkeeper.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/seahorse/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:20 -0000	1.2
+++ sources	8 Mar 2005 02:16:03 -0000	1.3
@@ -1 +1 @@
-8f77822212a8dff24a56f2855913fc29  seahorse-0.7.3.tar.gz
+b0a0942faabc1dd9367b4bea9cdd9c4a  seahorse-0.7.6.tar.bz2




More information about the fedora-extras-commits mailing list