[gnome-keyring/f16] Fix the build and add mime database scriplets

Kalev Lember kalev at fedoraproject.org
Wed Aug 31 18:11:15 UTC 2011


commit 7b69d345e75d0130e5daea8c70aa8b9be52e0cc2
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Aug 31 21:10:38 2011 +0300

    Fix the build and add mime database scriplets

 gnome-keyring.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 20c74bc..b610ba8 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -69,9 +69,9 @@ automatically unlock the "login" keyring when the user logs in.
 
 %build
 %configure --disable-gtk-doc \
+           --disable-update-mime \
            --with-pam-dir=/%{_lib}/security \
-           --enable-pam \
-           --with-gtk=3.0
+           --enable-pam
 
 # avoid unneeded direct dependencies
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
@@ -90,10 +90,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 
 %post
 /sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch %{_datadir}/icons/hicolor >&/dev/null || :
 
 %postun
 /sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
@@ -116,6 +118,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_libdir}/pkcs11/*.so
 # GPL
 %attr(0755,root,root) %caps(cap_ipc_lock=ep) %{_bindir}/gnome-keyring-daemon
+%{_bindir}/gcr-viewer
 %{_bindir}/gnome-keyring
 %{_bindir}/gnome-keyring-3
 %{_libexecdir}/*
@@ -127,6 +130,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/mime/packages/gcr-crypto-types.xml
 %{_sysconfdir}/pkcs11/modules/gnome-keyring-module
 
 %files devel


More information about the scm-commits mailing list