- updated to 3.0.0; merged from DEVEL

Changed files:
    gnome-keyring.spec -> 1.84

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index fc8071850e94907c51202d36af7d2675cf4e9679..32afd465f1c3585c0a83147255c46131f1ae7e72 100644 (file)
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,12 +1,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
@@ -15,9 +15,10 @@ BuildRequires:       dbus-devel >= 1.2.0
 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
@@ -70,7 +71,7 @@ Group:                X11/Development/Libraries
 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
@@ -137,8 +138,10 @@ w czasie logowania użytkownika i uruchamiania demona keyring.
        --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
@@ -148,8 +151,9 @@ rm -rf $RPM_BUILD_ROOT
        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}
 
@@ -171,16 +175,18 @@ fi
 %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
@@ -188,37 +194,36 @@ fi
 %{_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)