rpms
/
gnome-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop gtk-doc dep

This commit is contained in:
Matthias Clasen 2010-08-23 22:08:10 -04:00
parent 87947a93e6
commit 037e1dca44
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnome-keyring.spec
View File

@ -8,13 +8,12 @@
Summary: Framework for managing passwords and other secrets
Name: gnome-keyring
Version: 2.31.4
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/gnome-keyring
Source: http://download.gnome.org/sources/gnome-keyring/2.31/gnome-keyring-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# http://bugzilla.redhat.com/529709
@ -22,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch3: gnome-keyring-2.28.1-nopass.patch
# Bug 611642 - gnome-keyring isn't staying unlocked
# Bug 611642 - gnome-keyring isn't staying unlocked
# https://bugzilla.redhat.com/show_bug.cgi?id=611642
Patch4: gnome-keyring-2.31.5-ssh-agent-unlock.patch
@ -56,9 +55,6 @@ License: LGPLv2+
Group: Development/Libraries
Requires: %name = %{version}-%{release}
Requires: glib2-devel
Requires: pkgconfig
# for /usr/share/gtk-doc/html
Requires: gtk-doc
# for smooth transition since the core was split
Requires: libgnome-keyring-devel
@ -105,7 +101,6 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install install-pam DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@ -118,25 +113,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
%find_lang gnome-keyring
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || :
%gconf_schema_upgrade gnome-keyring
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || :
fi
%gconf_schema_prepare gnome-keyring
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas > /dev/null || :
fi
%gconf_schema_remove gnome-keyring
%postun -p /sbin/ldconfig
@ -163,8 +148,7 @@ fi
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
%doc %{_datadir}/gtk-doc/html/gp11/
%doc %{_datadir}/gtk-doc/html/gcr/
%doc %{_datadir}/gtk-doc
%files pam
%defattr(-, root, root)
@ -172,6 +156,10 @@ fi
%changelog
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-3
- Co-own /usr/share/gtk-doc (#604359)
- Some spec file cleanups
* Tue Jul 20 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.31.4-2
- ssh-agent: fix key unlocking (#611642)