- updated to 3.16.0

- separated -ui*

diff --git a/gcr.spec b/gcr.spec
index 19ce0c99d63e8dfe1f5f1e47c8adaec9f5960b46..25d20d6ea5d159af9d479c12a530ae06637aafad 100644 (file)
--- a/gcr.spec
+++ b/gcr.spec
@@ -7,12 +7,12 @@
 Summary:       GObject and GUI library for high level crypto parsing and display
 Summary(pl.UTF-8):     Biblioteka GObject i GUI do wysokopoziomowej analizy i wyświetlania danych kryptograficznych
 Name:          gcr
-Version:       3.14.0
-Release:       2
+Version:       3.16.0
+Release:       1
 License:       LGPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gcr/3.14/%{name}-%{version}.tar.xz
-# Source0-md5: f2a620c5f6c0cd570b4e3bed287ed302
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gcr/3.16/%{name}-%{version}.tar.xz
+# Source0-md5: d5835680be0b6a838e02a528d5378d9c
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -20,7 +20,7 @@ BuildRequires:        gettext-tools
 BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnupg
 BuildRequires: gobject-introspection-devel >= 1.34.0
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.10.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libgcrypt-devel >= 1.4.5
@@ -32,11 +32,11 @@ BuildRequires:      rpmbuild(macros) >= 1.592
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.20.0}
 BuildRequires: xz
-Requires:      %{name}-libs = %{version}-%{release}
 Requires(post,postun): glib2 >= 1:2.38.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): shared-mime-info
 Requires(post,postun): desktop-file-utils
+Requires:      %{name}-ui = %{version}-%{release}
 Requires:      gnupg
 Requires:      hicolor-icon-theme
 Conflicts:     gnome-keyring < 3.3.0
@@ -100,19 +100,6 @@ Static gcr and gck libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki gcr i gck.
 
-%package apidocs
-Summary:       gcr and gck API documentation
-Summary(pl.UTF-8):     Dokumentacja API bibliotek gcr i gck
-Group:         Documentation
-Requires:      gtk-doc-common
-Obsoletes:     gnome-keyring-apidocs < 3.3.0
-
-%description apidocs
-API and gck documentation for gcr library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API bibliotek gcr i gck.
-
 %package -n vala-gcr
 Summary:       gcr and gck API for Vala language
 Summary(pl.UTF-8):     API gcr i gck dla języka Vala
@@ -126,6 +113,71 @@ gcr and gck API for Vala language.
 %description -n vala-gcr -l pl.UTF-8
 API gcr i gck dla języka Vala.
 
+%package ui
+Summary:       gcr UI library
+Summary(pl.UTF-8):     Biblioteka interfejsu użytkownika gcr
+Group:         X11/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      gtk+3 >= 3.10.0
+
+%description ui
+gcr UI library.
+
+%description ui -l pl.UTF-8
+Biblioteka interfejsu użytkownika gcr.
+
+%package ui-devel
+Summary:       Header files for gcr-ui library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gcr-ui
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-ui = %{version}-%{release}
+Requires:      gtk+3-devel >= 3.10.0
+
+%description ui-devel
+Header files for gcr-ui library.
+
+%description ui-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki gcr-ui.
+
+%package ui-static
+Summary:       Static gcr-ui library
+Summary(pl.UTF-8):     Statyczna biblioteka gcr-ui
+Group:         X11/Development/Libraries
+Requires:      %{name}-ui-devel = %{version}-%{release}
+
+%description ui-static
+Static gcr-ui library.
+
+%description ui-static -l pl.UTF-8
+Statyczna biblioteka gcr-ui.
+
+%package -n vala-gcr-ui
+Summary:       gcr-ui API for Vala language
+Summary(pl.UTF-8):     API gcr-ui dla języka Vala
+Group:         X11/Development/Libraries
+Requires:      %{name}-ui-devel = %{version}-%{release}
+Requires:      vala-gcr = %{version}-%{release}
+
+%description -n vala-gcr-ui
+gcr-ui API for Vala language.
+
+%description -n vala-gcr-ui -l pl.UTF-8
+API gcr-ui dla języka Vala.
+
+%package apidocs
+Summary:       gcr and gck API documentation
+Summary(pl.UTF-8):     Dokumentacja API bibliotek gcr i gck
+Group:         Documentation
+Requires:      gtk-doc-common
+Obsoletes:     gnome-keyring-apidocs < 3.3.0
+
+%description apidocs
+API and gck documentation for gcr library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek gcr i gck.
+
 %prep
 %setup -q
 
@@ -174,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
+%post  ui -p /sbin/ldconfig
+%postun        ui -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HACKING NEWS README
@@ -188,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gcr-3
 %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 %{_datadir}/mime/packages/gcr-crypto-types.xml
-%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*x*/apps/gcr-*.png
 
 %files libs
 %defattr(644,root,root,755)
@@ -198,41 +253,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.1
 %attr(755,root,root) %{_libdir}/libgcr-base-3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgcr-base-3.so.1
-%attr(755,root,root) %{_libdir}/libgcr-ui-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcr-ui-3.so.1
 %{_libdir}/girepository-1.0/Gck-1.typelib
 %{_libdir}/girepository-1.0/Gcr-3.typelib
-%{_libdir}/girepository-1.0/GcrUi-3.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgck-1.so
 %attr(755,root,root) %{_libdir}/libgcr-3.so
 %attr(755,root,root) %{_libdir}/libgcr-base-3.so
-%attr(755,root,root) %{_libdir}/libgcr-ui-3.so
 %{_datadir}/gir-1.0/Gck-1.gir
 %{_datadir}/gir-1.0/Gcr-3.gir
-%{_datadir}/gir-1.0/GcrUi-3.gir
 %{_includedir}/gck-1
-%{_includedir}/gcr-3
+%dir %{_includedir}/gcr-3
+%dir %{_includedir}/gcr-3/gcr
+%{_includedir}/gcr-3/gcr/gcr-*.h
 %{_pkgconfigdir}/gck-1.pc
-%{_pkgconfigdir}/gcr-3.pc
 %{_pkgconfigdir}/gcr-base-3.pc
-%{_pkgconfigdir}/gcr-ui-3.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgck-1.a
 %{_libdir}/libgcr-base-3.a
-%{_libdir}/libgcr-ui-3.a
-%endif
-
-%if %{with apidocs}
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gck
-%{_gtkdocdir}/gcr-3
 %endif
 
 %if %{with vala}
@@ -242,7 +284,40 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gck-1.vapi
 %{_datadir}/vala/vapi/gcr-3.deps
 %{_datadir}/vala/vapi/gcr-3.vapi
+%{_datadir}/vala/vapi/pkcs11.vapi
+%endif
+
+%files ui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgcr-ui-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcr-ui-3.so.1
+%{_libdir}/girepository-1.0/GcrUi-3.typelib
+
+%files ui-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgcr-ui-3.so
+%{_datadir}/gir-1.0/GcrUi-3.gir
+%{_includedir}/gcr-3/gcr/gcr.h
+%{_includedir}/gcr-3/ui
+%{_pkgconfigdir}/gcr-3.pc
+%{_pkgconfigdir}/gcr-ui-3.pc
+
+%if %{with static_libs}
+%files ui-static
+%defattr(644,root,root,755)
+%{_libdir}/libgcr-ui-3.a
+%endif
+
+%if %{with vala}
+%files -n vala-gcr-ui
+%defattr(644,root,root,755)
 %{_datadir}/vala/vapi/gcr-ui-3.deps
 %{_datadir}/vala/vapi/gcr-ui-3.vapi
-%{_datadir}/vala/vapi/pkcs11.vapi
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gck
+%{_gtkdocdir}/gcr-3
 %endif