packages: gnome-keyring/gnome-keyring.spec - updated to 3.4.0; merged chang...

megabajt megabajt at pld-linux.org
Tue Mar 27 00:04:15 CEST 2012 

Author: megabajt                     Date: Mon Mar 26 22:04:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.4.0; merged changes from DEVEL

---- Files affected:
packages/gnome-keyring:
   gnome-keyring.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/gnome-keyring/gnome-keyring.spec
diff -u packages/gnome-keyring/gnome-keyring.spec:1.93 packages/gnome-keyring/gnome-keyring.spec:1.94
--- packages/gnome-keyring/gnome-keyring.spec:1.93	Thu Feb  2 13:32:32 2012
+++ packages/gnome-keyring/gnome-keyring.spec	Tue Mar 27 00:04:10 2012
@@ -8,20 +8,21 @@
 Summary:	Keep passwords and other user's secrets
 Summary(pl.UTF-8):	Przechowywanie haseł i innych tajnych danych użytkowników
 Name:		gnome-keyring
-Version:	3.2.2
-Release:	2
+Version:	3.4.0
+Release:	1
 License:	LGPL v2+ (library), GPL v2+ (programs)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	0269f897bf6bc71df8b8cecd5f8e2f6c
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.4/%{name}-%{version}.tar.xz
+# Source0-md5:	f4e62be30e7fdd8333eeabeb74e1012d
 URL:		http://live.gnome.org/GnomeKeyring
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	cairo-devel
 BuildRequires:	dbus-devel >= 1.2.0
 BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gcr-devel >= 3.4.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	glib2-devel >= 1:2.28.0
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
@@ -37,11 +38,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.592
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
-Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	glib2 >= 1:2.26.0
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	shared-mime-info
 Requires:	dbus >= 1.2.0
 Requires:	hicolor-icon-theme
 Conflicts:	rpm < 4.4.2-0.2
@@ -62,72 +59,6 @@
 ssh-agenta, a inne aplikacje mogą znaleźć go poprzez zmienną
 środowiskową.
 
-%package libs
-Summary:	GNOME keyring support libraries
-Summary(pl.UTF-8):	Biblioteki wspomagające GNOME keyring
-License:	LGPL v2+
-Group:		X11/Libraries
-Requires:	dbus-libs >= 1.2.0
-Requires:	glib2 >= 1:2.26.0
-Requires:	libgcrypt >= 1.2.2
-Requires:	p11-kit >= 0.6
-
-%description libs
-GNOME keyring support libraries:
-- gck: GObject bindings for PKCS#11
-- gcr: GObject and GUI library for high level crypto parsing and
-  display
-
-%description libs -l pl.UTF-8
-Biblioteki wspomagające GNOME keyring:
-- gck: wiązania GObject do PKCS#11
-- gcr: biblioteka GObject i GUI do wysokopoziomowej analizy i
-  wyświetlania danych związanych z kryptografią.
-
-%package devel
-Summary:	Headers for GNOME keyring support libraries
-Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek wspomagających GNOME keyring
-License:	LGPL v2+
-Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus-devel >= 1.2.0
-Requires:	glib2-devel >= 1:2.26.0
-Requires:	gtk+3-devel >= 3.0.0
-Requires:	libgcrypt-devel >= 1.2.2
-Requires:	p11-kit-devel >= 0.6
-
-%description devel
-Headers for GNOME keyring support libraries (gck and gcr).
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe bibliotek wspomagających GNOME keyring (gck i gcr).
-
-%package static
-Summary:	Static GNOME keyring support libraries
-Summary(pl.UTF-8):	Statyczne biblioteki wspomagające GNOME keyring
-License:	LGPL v2+
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static GNOME keyring support libraries (gck and gcr).
-
-%description static -l pl.UTF-8
-Statyczne biblioteki wspomagające GNOME keyring (gck i gcr).
-
-%package apidocs
-Summary:	GNOME keyring (gck and gcr) API documentation
-Summary(pl.UTF-8):	Dokumentacja API GNOME keyring (gck i gcr)
-License:	LGPL v2+
-Group:		Documentation
-Requires:	gtk-doc-common
-
-%description apidocs
-GNOME keyring (gck and gcr) API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API GNOME keyring (gck i gcr).
-
 %package -n pam-pam_gnome_keyring
 Summary:	A PAM module for unlocking keyrings at login time
 Summary(pl.UTF-8):	Moduł PAM do odblokowywania zbiorów kluczy w czasie logowania
@@ -159,12 +90,12 @@
 %configure \
 	--disable-silent-rules \
 	%{!?with_p11_tests:--disable-p11-tests} \
-	--disable-tests \
 	--enable-gtk-doc \
 	--enable-static \
 	--with-html-dir=%{_gtkdocdir} \
 	--with-pam-dir=/%{_lib}/security \
-	--with-root-certs=%{_sysconfdir}/certs
+	--with-root-certs=%{_sysconfdir}/certs \
+	--with-ca-certificates=%{_sysconfdir}/certs/ca-certificates.crt
 %{__make}
 
 %install
@@ -174,7 +105,6 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/pkcs11/gnome-keyring-pkcs11.{l,}a
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.{l,}a
 
@@ -184,32 +114,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%update_mime_database
-%update_desktop_database_post
-%update_icon_cache hicolor
 %glib_compile_schemas
 
 %postun
-%update_mime_database
-%update_desktop_database_postun
-%update_icon_cache hicolor
 %glib_compile_schemas
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/gcr-viewer
 %attr(755,root,root) %{_bindir}/gnome-keyring
 %attr(755,root,root) %{_bindir}/gnome-keyring-3
 %attr(755,root,root) %{_bindir}/gnome-keyring-daemon
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt
-%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt-3
 %dir %{_libdir}/pkcs11
 %attr(755,root,root) %{_libdir}/pkcs11/gnome-keyring-pkcs11.so
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/devel
 %attr(755,root,root) %{_libdir}/%{name}/devel/gkm-gnome2-store-standalone.so
 %attr(755,root,root) %{_libdir}/%{name}/devel/gkm-roots-store-standalone.so
@@ -223,40 +141,8 @@
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/dbus-1/services/org.freedesktop.secrets.service
 %{_datadir}/dbus-1/services/org.gnome.keyring.service
-%{_datadir}/gcr-3
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/gnome-keyring-3
-%{_desktopdir}/gcr-viewer.desktop
-%{_desktopdir}/gnome-keyring-prompt.desktop
 %{_sysconfdir}/pkcs11/modules/gnome-keyring-module
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_datadir}/mime/packages/gcr-crypto-types.xml
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.1
-%attr(755,root,root) %{_libdir}/libgck-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgck-1.so.0
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr-3.so
-%attr(755,root,root) %{_libdir}/libgck-1.so
-%{_includedir}/gcr-3
-%{_includedir}/gck-1
-%{_pkgconfigdir}/gcr-3.pc
-%{_pkgconfigdir}/gck-1.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgcr-3.a
-%{_libdir}/libgck-1.a
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gcr-3
-%{_gtkdocdir}/gck
 
 %files -n pam-pam_gnome_keyring
 %defattr(644,root,root,755)
@@ -268,6 +154,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2012/03/26 22:04:10  megabajt
+- updated to 3.4.0; merged changes from DEVEL
+
+Revision 1.93.2.2  2012/03/23 09:12:00  megabajt
+- updated to 3.3.92
+
+Revision 1.93.2.1  2012/03/10 21:18:49  megabajt
+- updated to 3.3.91
+
 Revision 1.93  2012/02/02 12:32:32  lisu
 - package missing dir
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnome-keyring/gnome-keyring.spec?r1=1.93&r2=1.94

More information about the pld-cvs-commit mailing list