packages: gnome-keyring/gnome-keyring.spec - updated to 3.0.0; merged from ...

megabajt megabajt at pld-linux.org
Mon Apr 4 19:14:16 CEST 2011 

Author: megabajt                     Date: Mon Apr  4 17:14:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/gnome-keyring:
   gnome-keyring.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/gnome-keyring/gnome-keyring.spec
diff -u packages/gnome-keyring/gnome-keyring.spec:1.83 packages/gnome-keyring/gnome-keyring.spec:1.84
--- packages/gnome-keyring/gnome-keyring.spec:1.83	Sun Mar 27 15:33:20 2011
+++ packages/gnome-keyring/gnome-keyring.spec	Mon Apr  4 19:14:10 2011
@@ -2,12 +2,12 @@
 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:	2.32.1
-Release:	3
+Version:	3.0.0
+Release:	1
 License:	LGPL v2+ (library), GPL v2+ (programs)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	9a8aa74e03361676f29d6e73155786fc
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	46f2eaa8ab7d099bedb91fd76ec94e04
 URL:		http://live.gnome.org/GnomeKeyring
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -16,9 +16,10 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.26.0
-BuildRequires:	gtk+2-devel >= 2:2.20.0
+BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libcap-devel
 BuildRequires:	libgcrypt-devel >= 1.2.2
 BuildRequires:	libtasn1-devel >= 0.3.4
 BuildRequires:	libtool
@@ -71,7 +72,7 @@
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-devel >= 1.2.0
 Requires:	glib2-devel >= 1:2.26.0
-Requires:	gtk+2-devel >= 2:2.20.0
+Requires:	gtk+3-devel >= 3.0.0
 Requires:	libtasn1-devel >= 0.3.4
 
 %description devel
@@ -138,8 +139,10 @@
 	--disable-silent-rules \
 	--enable-gtk-doc \
 	--enable-static \
+	--with-gtk=3.0 \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-pam-dir=/%{_lib}/security
+	--with-pam-dir=/%{_lib}/security \
+	--with-root-certs=%{_sysconfdir}/certs
 %{__make}
 
 %install
@@ -149,8 +152,9 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/{devel,standalone}/*.{la,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
 
 %find_lang %{name}
 
@@ -172,16 +176,18 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %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) %{_libdir}/%{name}/gnome-keyring-pkcs11.so
+%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt-3
+%attr(755,root,root) %{_libdir}/pkcs11/gnome-keyring-pkcs11.so
 %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
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-secret-store-standalone.so
 %attr(755,root,root) %{_libdir}/%{name}/devel/gkm-ssh-store-standalone.so
-%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-user-store-standalone.so
-%dir %{_libdir}/%{name}/standalone
-%attr(755,root,root) %{_libdir}/%{name}/standalone/gkm-roots-store-standalone.so
-%attr(755,root,root) %{_libdir}/%{name}/standalone/gkm-secret-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-xdg-store-standalone.so
 %{_sysconfdir}/xdg/autostart/gnome-keyring-gpg.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
 %{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
@@ -189,37 +195,36 @@
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/dbus-1/services/org.freedesktop.secrets.service
 %{_datadir}/dbus-1/services/org.gnome.keyring.service
-%{_datadir}/gcr
+%{_datadir}/gcr-3
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/gnome-keyring
+%{_datadir}/gnome-keyring-3
+%{_desktopdir}/gnome-keyring-prompt.desktop
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgp11.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcr.so.0
-%attr(755,root,root) %ghost %{_libdir}/libgp11.so.0
+%attr(755,root,root) %{_libdir}/libgcr-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.0
+%attr(755,root,root) %{_libdir}/libgck.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgck.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr.so
-%attr(755,root,root) %{_libdir}/libgp11.so
-%{_libdir}/libgcr.la
-%{_libdir}/libgp11.la
-%{_includedir}/gcr
-%{_includedir}/gp11
-%{_pkgconfigdir}/gcr-0.pc
-%{_pkgconfigdir}/gp11-0.pc
+%attr(755,root,root) %{_libdir}/libgcr-3.so
+%attr(755,root,root) %{_libdir}/libgck.so
+%{_includedir}/gcr-3
+%{_includedir}/gck
+%{_pkgconfigdir}/gcr-3.pc
+%{_pkgconfigdir}/gck-0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgcr.a
-%{_libdir}/libgp11.a
+%{_libdir}/libgcr-3.a
+%{_libdir}/libgck.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gcr-0
-%{_gtkdocdir}/gp11
+%{_gtkdocdir}/gcr-3
+%{_gtkdocdir}/gck
 
 %files -n pam-pam_gnome_keyring
 %defattr(644,root,root,755)
@@ -231,12 +236,43 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2011/04/04 17:14:10  megabajt
+- updated to 3.0.0; merged from DEVEL
+
 Revision 1.83  2011/03/27 13:33:20  qboosh
 - en at shaw locale is now supported (via LANGUAGE)
 
+Revision 1.81.2.9  2011/03/21 17:59:12  megabajt
+- updated to 2.91.93
+
+Revision 1.81.2.8  2011/03/10 16:52:58  megabajt
+- updated to 2.91.92
+
+Revision 1.81.2.7  2011/03/07 18:56:07  megabajt
+- updated to 2.91.91
+- dropped libtool files
+
+Revision 1.81.2.6  2011/02/26 16:31:50  patrys
+- provide path to certs
+
+Revision 1.81.2.5  2010/12/28 22:09:06  wiget
+- 2.91.4
+
 Revision 1.82  2010/12/09 16:35:41  megabajt
 - use %glib_compile_schemas
 - release 3
+
+Revision 1.81.2.4  2010/12/02 22:53:55  wiget
+- 2.91.3
+
+Revision 1.81.2.3  2010/11/11 13:53:43  megabajt
+- updated to 2.91.2
+
+Revision 1.81.2.2  2010/11/06 15:13:02  wiget
+- build with gtk+3
+
+Revision 1.81.2.1  2010/11/06 14:42:10  wiget
+- 2.91.1
 
 Revision 1.81  2010/10/28 08:20:41  glen
 - compile schemas after deps being installed (use posttrans for that); rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-keyring/gnome-keyring.spec?r1=1.83&r2=1.84&f=u

More information about the pld-cvs-commit mailing list