- fixes service file creation

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

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index dd2ccb910d4f4f931e42dd5c66ac96266eff812d..86062d23902b9e68a9df6d416c81d0002b33a2b6 100644 (file)
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,31 +1,33 @@
 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.22.0
-Release:       1
+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.22/%{name}-%{version}.tar.bz2
-# Source0-md5: d27c5bf11579069eb694f93b71364bb4
+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.22.0
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: dbus-devel >= 1.1.2
+BuildRequires: dbus-devel >= 1.2.0
+BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.12.8
-BuildRequires: gtk-doc >= 1.8
-BuildRequires: hal-devel >= 0.5.10
-BuildRequires: intltool >= 0.37.0
+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
+BuildRequires: libtasn1-devel >= 0.3.4
 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
+Requires:      dbus >= 1.2.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,7 +55,7 @@ z systemem kluczy GNOME.
 Summary:       GNOME keyring library
 Summary(pl.UTF-8):     Biblioteka GNOME keyring
 License:       LGPL v2+
-Group:         Libraries
+Group:         X11/Libraries
 
 %description libs
 GNOME keyring library.
@@ -65,10 +67,11 @@ Biblioteka GNOME keyring.
 Summary:       Headers for GNOME keyring library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GNOME keyring
 License:       LGPL v2+
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      dbus-devel >= 1.1.2
-Requires:      glib2-devel >= 1:2.16.0
+Requires:      dbus-devel >= 1.2.0
+Requires:      gtk+2-devel >= 2:2.18.0
+Requires:      libtasn1-devel >= 0.3.4
 
 %description devel
 Headers for GNOME keyring library.
@@ -80,7 +83,7 @@ Pliki nagłówkowe biblioteki GNOME keyring.
 Summary:       Static GNOME keyring libraries
 Summary(pl.UTF-8):     Statyczne biblioteki GNOME keyring
 License:       LGPL v2+
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
@@ -102,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
 
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
+rm -f po/en@shaw.po
+sed -i -e 's/en@shaw//' po/LINGUAS
 
 %build
+%{__gtkdocize}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -132,6 +139,7 @@ mv po/sr@{Latn,latin}.po
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-schemas-install \
        --enable-gtk-doc \
        --enable-static \
        --with-html-dir=%{_gtkdocdir} \
@@ -144,8 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install install-pam \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
+%{__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}
 
 %find_lang %{name}
 
@@ -163,34 +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-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}/libgnome-keyring.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnome-keyring.so.0
+%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
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnome-keyring.so
-%{_libdir}/libgnome-keyring.la
-%{_includedir}/gnome-keyring-1
-%{_pkgconfigdir}/gnome-keyring-1.pc
+%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
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgnome-keyring.a
+%{_libdir}/libgcr.a
+%{_libdir}/libgp11.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}
+%{_gtkdocdir}/gcr
+%{_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