diff --git a/.cvsignore b/.cvsignore index f0f57a2..cdba868 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -almanah-0.4.0.tar.gz +almanah-0.5.0.tar.gz diff --git a/almanah.spec b/almanah.spec index 16e2822..53d3dc5 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,6 +1,6 @@ Name: almanah -Version: 0.4.0 -Release: 2%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: A application to allow you to keep a diary of your life Group: Applications/Productivity @@ -10,7 +10,11 @@ Source0: http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel -BuildRequires: glib2-devel gtk2-devel intltool desktop-file-utils +BuildRequires: glib2-devel gtk2-devel intltool desktop-file-utils seahorse-devel + +Requires(pre): GConf2 +Requires(post): GConf2 +Requires(preun): GConf2 %description Almanah is a small GTK+ application to allow you to keep a diary of your life. @@ -22,12 +26,13 @@ sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in %build -%configure +%configure --enable-encryption --enable-spell-checking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="fedora" \ --delete-original \ @@ -40,18 +45,33 @@ desktop-file-install --vendor="fedora" \ rm -rf $RPM_BUILD_ROOT +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi - +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %files -f %{name}.lang @@ -61,9 +81,13 @@ fi %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop +%{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Wed Dec 3 2008 Jean-François Martin - 0.5.0-1 +- Update to the new release + * Mon Jul 14 2008 Jean-François Martin - 0.4.0-2 - Fix rpmlint warnings - Include ChangeLog diff --git a/sources b/sources index 8c4dfac..a103f65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59cdbff0ba8e53d736011608aeb6a8e3 almanah-0.4.0.tar.gz +b6469a0a60b760798d3253ee77d6b9f4 almanah-0.5.0.tar.gz