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

@@ -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
 

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+
+Recommends:     %{name}-lang
-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/
 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
+%desktop_database_post
-  usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null
+%icon_theme_cache_post
-fi
 
 %postun
 /sbin/ldconfig
-if test -x usr/bin/update-mime-database ; then
+%desktop_database_postun
-  usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null
+%icon_theme_cache_postun
-fi
 
 %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)
+%dir %{_datadir}/gnome/
-%{_prefix}/bin/*
+%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)