Accepting request 77009 from home:vuntz:branches:GNOME:Factory

Update to 3.1.4

OBS-URL: https://build.opensuse.org/request/show/77009
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=99

seahorse-3.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:819cfb2ead0fbd2030d4da2141e5190cd9bafeaa3e9fdec4a4224a5da5e7cb47
-size 2549484

seahorse-3.1.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c26b5955ab9ea5546c071e429000fca26ffb66e343b1f1dd81f0f6203737e58
+size 2470900

seahorse.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Jul 25 16:04:12 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.4:
+  + Create new keyring items in the right keyring.
+  + Remove dependency on GTK+ 2.x.
+  + Split out libcryptui into its own module.
+- Remove gobject-introspection-devel and libnotify-devel
+  BuildRequires: the dependencies are now gone.
+- Remove libassuan-devel, libgpg-error-devel, libxml2-devel
+  BuildRequires: they weren't needed.
+- Move to pkgconfig()-style BuildRequires:
+  + Old ones: gconf2-devel, libavahi-glib-devel, libgck-devel,
+    libgcr-devel, libgnome-keyring-devel, libsoup-devel.
+  + New ones: avahi-client, avahi-glib, gck-1, gconf-2.0, gcr-3,
+    gio-2.0, gnome-keyring-1, gtk+-3.0, libsoup-2.4.
+- Manually remove %{_datadir}/gtk-doc/html/libseahorse/ as there is
+  no libseahorse public library.
+- Drop devel subpackage since there is no file left for it. Add an
+  Obsoletes for it to the main package for smooth upgrades.
+- Remove --with-gtk=3.0 from configure, as GTK+ 2.x support was
+  removed.
+- Remove /sbin/ldconfig call from %post/%postun as there's no
+  library anymore.
+
 -------------------------------------------------------------------
 Fri May 27 16:48:07 CEST 2011 - vuntz@opensuse.org
 

seahorse.spec

@@ -21,55 +21,44 @@
 Name:           seahorse
 License:        GPLv2+
 Group:          Productivity/Security
-Version:        3.1.1
+Version:        3.1.4
 Release:        1
 Summary:        GNOME interface for gnupg
 Url:            http://seahorse.sourceforge.net/
-Source:         ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/seahorse/3.1/%{name}-%{version}.tar.bz2
 BuildRequires:  fdupes
-BuildRequires:  gconf2-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gobject-introspection-devel
 BuildRequires:  gpg2
 BuildRequires:  gpgme-devel
 BuildRequires:  intltool
-BuildRequires:  libavahi-glib-devel
-BuildRequires:  libassuan-devel
-BuildRequires:  libgck-devel
-BuildRequires:  libgcr-devel
-BuildRequires:  libgnome-keyring-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libsoup-devel
-BuildRequires:  libxml2-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  openssh
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(avahi-glib)
+BuildRequires:  pkgconfig(gck-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gcr-3)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gnome-keyring-1)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libsoup-2.4)
 Recommends:     %{name}-lang
+Obsoletes:      %{name}-devel < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
 %description
 Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
 
-%package devel
-License:        GPLv2+
-Summary:        GNOME interface for gnupg
-Group:          System/GUI/GNOME
-Requires:       %{name} = %{version}
-Requires:       gconf2-devel
-
-%description devel
-Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend.
-
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
 
 %build
-%configure --with-gtk=3.0 \
+%configure \
         --disable-scrollkeeper \
         --disable-schemas-install
 make %{?jobs:-j%jobs} V=1
@@ -80,6 +69,8 @@ make %{?jobs:-j%jobs} V=1
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 %{__rm} -f %{buildroot}%{_libdir}/*.*a
+# there's no public libseahorse library, so we don't need the doc (bgo#655275)
+rm -r %{buildroot}%{_datadir}/gtk-doc/html/libseahorse/
 %suse_update_desktop_file -G "Passwords and Encryption Keys" -N "Seahorse" %{name}
 %find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
@@ -92,12 +83,10 @@ make %{?jobs:-j%jobs} V=1
 %preun -f %{name}.schemas_preun
 
 %post
-/sbin/ldconfig
 %desktop_database_post
 %icon_theme_cache_post
 
 %postun
-/sbin/ldconfig
 %desktop_database_postun
 %icon_theme_cache_postun
 
@@ -114,29 +103,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/omf/
 %dir %{_datadir}/omf/%{name}/
 %doc %{_datadir}/omf/%{name}/%{name}-C.omf
-%{_bindir}/*
-%{_libdir}/seahorse
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/CryptUI-0.0.typelib
-%{_datadir}/applications/*.desktop
-%{_datadir}/dbus-1/services/org.gnome.seahorse.service
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/pixmaps/seahorse
-%{_datadir}/seahorse
-%{_mandir}/man1/*.1.*
+%{_bindir}/seahorse
+%{_libdir}/seahorse/
+%{_datadir}/applications/seahorse.desktop
+%{_datadir}/icons/hicolor/*/*/seahorse.png
+%{_datadir}/icons/hicolor/*/*/seahorse-preferences.png
+%{_datadir}/pixmaps/seahorse/
+%{_datadir}/seahorse/
+%{_mandir}/man1/seahorse.1.*
 
 %files lang -f %{name}.lang
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/libcryptui/
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-%{_datadir}/gir-1.0/CryptUI-0.0.gir
-%{_datadir}/gtk-doc/html/libcryptui
-%{_datadir}/gtk-doc/html/libseahorse
-# Own these repositories to not depend on gtk-doc while building:
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-
 %changelog