From 2249f970164c5e3a45e7f1d1ad3a51d6d4385c30d3eb81ed8236f98a7e9126e6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 2 Feb 2011 00:50:08 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/seahorse revision 56.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=6a5e5e26b8bf49bf5bc9fe68980c1d90 --- seahorse.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seahorse.spec b/seahorse.spec index 8088d13..21087e9 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,7 +1,7 @@ # -# spec file for package seahorse (Version 2.32.0) +# spec file for package seahorse # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/Security Version: 2.32.0 -Release: 1 +Release: 2 Requires: %{name}-lang = %{version} Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 From 6cbee76c9394443b018a08f43c45fa039558adb8a2cb199adeeec85764e34d43 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 21:19:56 +0000 Subject: [PATCH 2/2] Accepting request 60847 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60847 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=90 --- seahorse.changes | 13 ++++++++++++ seahorse.spec | 51 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/seahorse.changes b/seahorse.changes index b76946c..9e1049e 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Feb 13 17:05:12 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + ------------------------------------------------------------------- Mon Jan 31 21:37:02 UTC 2011 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 21087e9..6d56137 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -19,6 +19,15 @@ Name: seahorse +License: GPLv2+ +Group: Productivity/Security +Version: 2.32.0 +Release: 2 +Summary: GNOME2 interface for gnupg +Url: http://seahorse.sourceforge.net/ +Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch +Patch1: seahorse-xsltproc-nonet.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel @@ -38,16 +47,7 @@ BuildRequires: openldap2-devel BuildRequires: openssh BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -License: GPLv2+ -Group: Productivity/Security -Version: 2.32.0 -Release: 2 -Requires: %{name}-lang = %{version} -Summary: GNOME2 interface for gnupg -Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch -Patch1: seahorse-xsltproc-nonet.patch -Url: http://seahorse.sourceforge.net/ +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -83,9 +83,8 @@ make %{?jobs:-j%jobs} %endif %{__rm} -f %{buildroot}%{_libdir}/*.*a %suse_update_desktop_file %{name} -G "Passwords and Encryption Keys" -N "Seahorse" -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst %fdupes $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre @@ -96,38 +95,38 @@ cat %{name}.schemas_list >%{name}.lst %post /sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null -fi +%desktop_database_post +%icon_theme_cache_post %postun /sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null -fi +%desktop_database_postun +%icon_theme_cache_postun %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS ChangeLog ChangeLog.pre-auto NEWS README -%defattr (-, root, root) -%{_prefix}/bin/* +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/%{name}/ +%doc %{_datadir}/gnome/help/%{name}/C/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/omf/%{name}/ +%doc %{_datadir}/omf/%{name}/%{name}-C.omf +%{_bindir}/* %{_libdir}/seahorse %{_libdir}/*.so.* %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.seahorse.service %{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/man/man1/*.1.gz %{_datadir}/pixmaps/seahorse %{_datadir}/seahorse +%{_mandir}/man1/*.1.* %files lang -f %{name}.lang -# Temporary workaround to not depend on libgnome: own the directories -%defattr (-, root, root) -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help %files devel %defattr(-,root,root)