- fixes service file creation

[packages/gnome-keyring.git] / gnome-keyring.spec

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 0c0fe8d7df38d4fc942a056e991cf47554359e92..86062d23902b9e68a9df6d416c81d0002b33a2b6 100644 (file)
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,21 +1,23 @@
 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.26.3
-Release:       2
+Version:       2.30.1
+Release:       3
 License:       LGPL v2+ (library), GPL v2+ (programs)
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5: d7639185dce46c26cf2e7d2a75028f78
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: 41f4d9323c4ad7c58d88348979f7daba
+Patch0:                %{name}-fix_service_file_creation.patch
+Patch1:                %{name}-use_org.freedesktop.secrets.patch
 URL:           http://live.gnome.org/GnomeKeyring
 BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dbus-devel >= 1.2.0
+BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: gtk-doc >= 1.8
-BuildRequires: hal-devel >= 0.5.10
+BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libgcrypt-devel >= 1.2.2
 BuildRequires: libtasn1-devel >= 0.3.4
@@ -68,7 +70,7 @@ License:      LGPL v2+
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus-devel >= 1.2.0
-Requires:      gtk+2-devel >= 2:2.14.0
+Requires:      gtk+2-devel >= 2:2.18.0
 Requires:      libtasn1-devel >= 0.3.4
 
 %description devel
@@ -103,28 +105,32 @@ GNOME keyring API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API GNOME keyring.
 
-%package pam
+%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
 License:       LGPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     gnome-keyring-pam
 
-%description pam
+%description -n pam-pam_gnome_keyring
 A PAM module that can automatically unlock the "login" keyring when
 the user logs in and start the keyring daemon.
 
-%description pam -l pl.UTF-8
+%description -n pam-pam_gnome_keyring -l pl.UTF-8
 Moduł PAM, który może automatycznie odblokowywać zbiór kluczy "login"
 w czasie logowania użytkownika i uruchamiania demona keyring.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
-rm -f po/ca@valencia.po
-sed -i -e 's/ca@valencia//' po/LINGUAS
+rm -f po/en@shaw.po
+sed -i -e 's/en@shaw//' po/LINGUAS
 
 %build
+%{__gtkdocize}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -133,6 +139,7 @@ sed -i -e 's/ca@valencia//' po/LINGUAS
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-schemas-install \
        --enable-gtk-doc \
        --enable-static \
        --with-html-dir=%{_gtkdocdir} \
@@ -165,58 +172,55 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/gnome-keyring
 %attr(755,root,root) %{_bindir}/gnome-keyring-daemon
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libexecdir}/%{name}-ask
+%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt
 %attr(755,root,root) %{_libdir}/%{name}/gnome-keyring-pkcs11.so
 %dir %{_libdir}/%{name}/devel
 %attr(755,root,root) %{_libdir}/%{name}/devel/gck-ssh-store-standalone.so
 %attr(755,root,root) %{_libdir}/%{name}/devel/gck-user-store-standalone.so
 %dir %{_libdir}/%{name}/standalone
 %attr(755,root,root) %{_libdir}/%{name}/standalone/gck-roots-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/standalone/gck-secret-store-standalone.so
 %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
-%{_sysconfdir}/xdg/autostart/gnome-keyring-daemon.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
+%{_datadir}/dbus-1/services/org.freedesktop.secrets.service
 %{_datadir}/dbus-1/services/org.gnome.keyring.service
 %{_datadir}/gcr
+%{_datadir}/gnome-keyring
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgcr.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgnome-keyring.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgp11.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgcr.so.0
-%attr(755,root,root) %ghost %{_libdir}/libgnome-keyring.so.0
 %attr(755,root,root) %ghost %{_libdir}/libgp11.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgcr.so
-%attr(755,root,root) %{_libdir}/libgnome-keyring.so
 %attr(755,root,root) %{_libdir}/libgp11.so
 %{_libdir}/libgcr.la
-%{_libdir}/libgnome-keyring.la
 %{_libdir}/libgp11.la
 %{_includedir}/gcr
-%{_includedir}/gnome-keyring-1
 %{_includedir}/gp11
 %{_pkgconfigdir}/gcr-0.pc
-%{_pkgconfigdir}/gnome-keyring-1.pc
 %{_pkgconfigdir}/gp11-0.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgcr.a
-%{_libdir}/libgnome-keyring.a
 %{_libdir}/libgp11.a
 
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gcr
-%{_gtkdocdir}/%{name}
 %{_gtkdocdir}/gp11
 
-%files pam
+%files -n pam-pam_gnome_keyring
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/security/pam_gnome_keyring.so