diff --git a/seahorse.spec b/seahorse.spec index ae91e56..51ac88f 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,11 +1,11 @@ Name: seahorse -Version: 0.8.1 -Release: 2%{?dist} -Summary: GNOME2 interface for gnupg +Version: 0.8.2 +Release: 1%{?dist} +Summary: GNOME interface for gnupg Group: User Interface/Desktops License: GPL -URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz +URL: http://seahorse.sourceforge.net/ +Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -13,104 +13,115 @@ BuildRequires: eel2-devel BuildRequires: gedit-devel BuildRequires: gettext BuildRequires: gpgme-devel >= 1.0 -BuildRequires: libgnomeui-devel BuildRequires: perl-XML-Parser BuildRequires: scrollkeeper BuildRequires: nautilus-devel BuildRequires: libsoup-devel -BuildRequires: openldap-devel -Requires(post): desktop-file-utils +BuildRequires: openldap-devel + +Requires(pre): GConf2 Requires(post): GConf2 +Requires(preun): GConf2 Requires(post): scrollkeeper -Requires(post): shared-mime-info -Requires(postun): desktop-file-utils Requires(postun): scrollkeeper -Requires(postun): shared-mime-info + %description -Seahorse is a gnome2 interface for gnupg. -It uses gpgme as the backend. +Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend. %prep %setup -q -sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in -sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am + %build -%configure --disable-schemas-install +%configure --disable-schemas-install --disable-static --disable-update-mime-database make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} - -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -%find_lang seahorse +make install DESTDIR=${RPM_BUILD_ROOT} +%find_lang %{name} rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category GNOME \ --add-category Utility \ - --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' %clean rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + SCHEMAS="seahorse-gedit.schemas seahorse.schemas" + for i in $SCHEMAS; do + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/$i >/dev/null || : + done +fi + + %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 \ - --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -scrollkeeper-update -q ||: -update-mime-database %{_datadir}/mime/ > /dev/null -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +SCHEMAS="seahorse-gedit.schemas seahorse.schemas" +for i in $SCHEMAS; do + gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/$i >/dev/null || : +done +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-mime-database %{_datadir}/mime &> /dev/null || : +update-desktop-database &> /dev/null ||: + + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + SCHEMAS="seahorse-gedit.schemas seahorse.schemas" + for i in $SCHEMAS; do + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/$i >/dev/null || : + done +fi %postun /sbin/ldconfig scrollkeeper-update -q ||: -update-mime-database %{_datadir}/mime/ > /dev/null -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +update-mime-database %{_datadir}/mime &> /dev/null || : +update-desktop-database &> /dev/null ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_bindir}/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/control-center-2.0/capplets/*.desktop -%dir %{_datadir}/gnome/help/%{name} -%{_datadir}/gnome/help/%{name}/* +%{_datadir}/gnome/help/%{name}/ %{_datadir}/mime-info/seahorse.keys %{_datadir}/mime-info/seahorse.mime %{_datadir}/mime/packages/* -%dir %{_datadir}/omf/%{name} -%{_datadir}/omf/%{name}/* +%{_datadir}/omf/%{name}/ %{_datadir}/pixmaps/* %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* @@ -119,6 +130,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Tue Nov 21 2006 Brian Pepple - 0.8.2-1 +- Update to 0.8.2. +- Minor tweak to summary & description. +- Drop BR on libgnomeui-devel, since eel2-devel pulls this in. +- Use -disable-update-mime-database instead of editing makefiles. +- Update scriptlets, and adjust Requires to follow wiki guidelines. +- Remove X-Fedora category from desktop files. +- Don't bother building static libs. +- Remove unnecessary disabling of schemas in install section. + * Mon Aug 28 2006 Seth Vidal - rebuild diff --git a/sources b/sources index dd2a1b1..a98a6ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f16678e465f20758aff293676e7e291 seahorse-0.8.1.tar.gz +ee7de41490edd7123de6e99880c34efd seahorse-0.8.2.tar.gz