rpms/gnome-keyring
5
0
Fork 0
Code Issues Pull Requests Releases Activity

drop gtk-doc dep

Browse Source
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

30
gnome-keyring.spec
View File

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