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

Cleanup before inclusion in Factory

OBS-URL: https://build.opensuse.org/request/show/91765
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gcr?expand=0&rev=2

gcr.spec

@@ -18,15 +18,21 @@
 
 Name:           gcr
 Version:        3.3.1.1
+# FIXME: on version update after 3.3.1.1, reenable introspection build (drop --disable-introspection). Currently broken.
 # FIXME: Verify if parallel build works again. Last checked in version 3.3.1.1
 Release:        1
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
 Summary:        Library for Crypto UI related task
 Url:            http://www.gnome.org
 Group:          System/Libraries
-Source:         %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
+BuildRequires:  gobject-introspection-devel
+# configure is looking for the gpg2 path
+BuildRequires:  gpg2
 BuildRequires:  intltool
 BuildRequires:  libgcrypt-devel >= 1.2.2
+# We need the %%mime_database_* macros
+BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.30.0
@@ -34,10 +40,9 @@ BuildRequires:  pkgconfig(gmodule-no-export-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0
-BuildRequires:  pkgconfig(p11-kit-1) >= 0.6
 BuildRequires:  pkgconfig(libtasn1)
+BuildRequires:  pkgconfig(p11-kit-1) >= 0.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gsettings_schema_requires
 
 %description
 GCR is a library for displaying certificates, and crypto UI, accessing
@@ -48,79 +53,72 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 (G)object oriented way.
 
 %package viewer
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
-Group:          System/GUI/GNOME
+Group:          Productivity/Security
-Summary:        Gnome Certificate Viewer
+Summary:        Viewer for Crypto Files
+Recommends:     %{name}-lang
 
 %description viewer
-Gnome Certificate Viewer
+This packages provides the viewer for crypto files on the GNOME desktop.
+
+%package data
+License:        LGPLv2.1+
+Group:          System/Libraries
+Summary:        Data and icon set for gcr
+%glib2_gsettings_schema_requires
+
+%description data
+This package provides the GSettings schemas and a collection of icons
+needed by libgcr.
 
 %package -n libgcr-3-1
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
-Group:          System/GUI/GNOME
+Group:          System/Libraries
 Summary:        Library for Crypto UI related task
 Requires:       %{name}-data >= %{version}
 Recommends:     %{name}-viewer = %{version}
 Recommends:     %{name}-lang
 
 %description -n libgcr-3-1
-GCR is a library for crypto UI and related tasks.
+GCR is a library for displaying certificates, and crypto UI, accessing
+key stores.
 
 %package -n libgcr-devel
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
 Group:          Development/Libraries/GNOME
 Summary:        Library for Crypto UI related task - Development Files
 Requires:       libgcr-3-1 = %{version}
 
 %description -n libgcr-devel
-The GNOME Keyring is a daemon in the session, similar to ssh-agent,
+GCR is a library for displaying certificates, and crypto UI, accessing
-and other applications can use it to store passwords and other
+key stores.
-sensitive information.
-
-The program can manage several keyrings, each with its own master
-password, and there is also a session keyring which is never stored to
-disk, but forgotten when the session ends.
 
 %package -n libgck-1-0
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
-Group:          System/GUI/GNOME
+Group:          System/Libraries
-Summary:        GObject bindings for PKCS#11
+Summary:        GObject library to access for PKCS#11 modules
-Recommends:     libgck-modules = %{version}
+Recommends:     %{name}-lang
 
 %description -n libgck-1-0
-GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+GCK is a library for accessing PKCS#11 modules like smart cards, in a
-interface.
+(G)object oriented way.
 
 %package -n libgck-devel
-License:        GPLv2+ ; LGPLv2.1+
+License:        LGPLv2.1+
 Group:          Development/Libraries/GNOME
-Summary:        GObject bindings for PKCS#11 - Development Files
+Summary:        GObject library to access for PKCS#11 modules - Development Files
 Requires:       libgck-1-0 = %{version}
 
 %description -n libgck-devel
-The GNOME Keyring is a daemon in the session, similar to ssh-agent,
+GCK is a library for accessing PKCS#11 modules like smart cards, in a
-and other applications can use it to store passwords and other
+(G)object oriented way.
-sensitive information.
-
-The program can manage several keyrings, each with its own master
-password, and there is also a session keyring which is never stored to
-disk, but forgotten when the session ends.
-
-%package data
-License:        GPLv2+ ; LGPLv2.1+
-Group:          System/Libraries
-Summary:        Data and icon set for gcr / gck
-
-%description data
-This package provides the GSetting schemas and a collection of icons
-needed by libgcr / libgck.
 
 %lang_package
 %prep
 %setup -q
 
 %build
-%configure
+%configure --disable-introspection
 # Parallel build seems broken.
 #make %{?_smp_mflags}
 make
@@ -134,37 +132,36 @@ rm %{buildroot}%{_libdir}/libmock-test-module.so
 %find_lang %{name}
 
 %post viewer
-%glib2_gsettings_schema_post
+%desktop_database_post
 %mime_database_post
 
 %postun viewer
-%glib2_gsettings_schema_postun
+%desktop_database_postun
-
+%mime_database_postun
-%post -n libgcr-3-1
-/sbin/ldconfig
-
-%postun -n libgcr-3-1
-/sbin/ldconfig
 
 %post data
+%glib2_gsettings_schema_post
 %icon_theme_cache_post
 
 %postun data
+%glib2_gsettings_schema_postun
 %icon_theme_cache_postun
 
+%post -n libgcr-3-1 -p /sbin/ldconfig
+
+%postun -n libgcr-3-1 -p /sbin/ldconfig
+
 %post -n libgck-1-0 -p /sbin/ldconfig
 
 %postun -n libgck-1-0 -p /sbin/ldconfig
 
 %files viewer
 %defattr(-,root,root)
-%doc ChangeLog README COPYING
+%doc AUTHORS ChangeLog COPYING HACKING NEWS README
 %{_bindir}/gcr-viewer
 %{_datadir}/applications/gcr-viewer.desktop
 %{_datadir}/mime/packages/gcr-crypto-types.xml
 
-%files lang -f %{name}.lang
-
 %files data
 %defattr(-, root, root)
 %{_datadir}/icons/hicolor/*/apps/*
@@ -177,6 +174,7 @@ rm %{buildroot}%{_libdir}/libmock-test-module.so
 
 %files -n libgcr-3-1
 %defattr (-, root, root)
+%doc AUTHORS ChangeLog COPYING HACKING NEWS README
 %{_libdir}/libgcr-3.so.*
 %{_libdir}/libgcr-base-3.so.*
 %{_datadir}/gcr-3/
@@ -192,6 +190,7 @@ rm %{buildroot}%{_libdir}/libmock-test-module.so
 
 %files -n libgck-1-0
 %defattr (-, root, root)
+%doc AUTHORS ChangeLog COPYING HACKING NEWS README
 %{_libdir}/libgck-1.so.*
 
 %files -n libgck-devel
@@ -199,8 +198,8 @@ rm %{buildroot}%{_libdir}/libmock-test-module.so
 %{_libdir}/libgck-1.so
 %{_libdir}/pkgconfig/gck-1.pc
 %{_includedir}/gck-1/
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/gck/
 
+%files lang -f %{name}.lang
+
 %changelog