SPECS: gnome-keyring.spec - updated to 2.22.0; merged changes from...

[megabajt]

Author: megabajt                     Date: Mon Mar 10 20:04:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.22.0; merged changes from DEVEL

---- Files affected:
SPECS:
   gnome-keyring.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/gnome-keyring.spec
diff -u SPECS/gnome-keyring.spec:1.52 SPECS/gnome-keyring.spec:1.53
--- SPECS/gnome-keyring.spec:1.52	Thu Jan 10 07:50:19 2008
+++ SPECS/gnome-keyring.spec	Mon Mar 10 21:04:45 2008
@@ -2,31 +2,37 @@
 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.20.3
+Version:	2.22.0
 Release:	1
 License:	LGPL v2+ (library), GPL v2+ (programs)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	2205177a168e745fa803c96a4fb62102
-URL:		http://www.gnome.org/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	d27c5bf11579069eb694f93b71364bb4
+URL:		http://live.gnome.org/GnomeKeyring
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-devel >= 1.1.2
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gtk+2-devel >= 2:2.12.8
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	hal-devel >= 0.5.9
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	hal-devel >= 0.5.10
+BuildRequires:	intltool >= 0.37.0
 BuildRequires:	libgcrypt-devel >= 1.2.2
+BuildRequires:	libtasn1-devel
 BuildRequires:	libtool
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	sed >= 4.0
+Requires(post,preun):	GConf2
 Requires:	dbus >= 1.1.2
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/%{name}
+
 %description
 GNOME Keyring is a program that keeps password and other secrets for
 users. It is run as a daemon in the session, similar to ssh-agent, and
@@ -63,7 +69,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-devel >= 1.1.2
-Requires:	glib2-devel >= 1:2.14.1
+Requires:	glib2-devel >= 1:2.16.0
 
 %description devel
 Headers for GNOME keyring library.
@@ -115,12 +121,16 @@
 %prep
 %setup -q
 
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
+
 %build
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--enable-gtk-doc \
@@ -133,19 +143,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install install-pam \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pkgconfigdir=%{_pkgconfigdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-rm -f $RPM_BUILD_ROOT%{_libdir}/pam_gnome_keyring*
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%gconf_schema_install gnome-keyring.schemas
+
+%preun
+%gconf_schema_uninstall gnome-keyring.schemas
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -153,7 +166,11 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/gnome-keyring-daemon
+%dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libexecdir}/%{name}-ask
+%attr(755,root,root) %{_libdir}/%{name}/gnome-keyring-pkcs11.so
+%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
+%{_datadir}/dbus-1/services/org.gnome.keyring.service
 
 %files libs
 %defattr(644,root,root,755)
@@ -185,12 +202,28 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.52  2008-01-10 06:50:19  qboosh
+Revision 1.53  2008-03-10 20:04:45  megabajt
+- updated to 2.22.0; merged changes from DEVEL
+
+Revision 1.50.2.4  2008-02-25 17:16:18  megabajt
+- updated to 2.21.92
+
+Revision 1.50.2.3  2008-02-12 12:46:31  megabajt
+- updated to 2.21.91
+
+Revision 1.50.2.2  2008-01-19 19:48:51  megabajt
+- updated to 2.21.5
+- more verbose files
+
+Revision 1.52  2008/01/10 06:50:19  qboosh
 - ghost soname symlink
 
 Revision 1.51  2008-01-09 20:18:36  megabajt
 - updated to 2.20.3
 
+Revision 1.50.2.1  2007-12-20 01:31:24  patrys
+- 2.21.4
+
 Revision 1.50  2007-11-24 22:58:56  megabajt
 - updated to 2.20.2
 
================================================================

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