rpms/almanah/devel .cvsignore, 1.3, 1.4 almanah.spec, 1.4, 1.5 import.log, 1.1, 1.2 sources, 1.3, 1.4

Tue Dec 8 12:57:27 UTC 2009

Author: th0br0

Update of /cvs/pkgs/rpms/almanah/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165/devel

Modified Files:
	.cvsignore almanah.spec import.log sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	3 Dec 2008 02:45:58 -0000	1.3
+++ .cvsignore	8 Dec 2009 12:57:27 -0000	1.4
@@ -1 +1 @@
-almanah-0.5.0.tar.gz
+almanah-0.6.1.tar.gz


Index: almanah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/almanah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- almanah.spec	24 Jul 2009 16:46:17 -0000	1.4
+++ almanah.spec	8 Dec 2009 12:57:27 -0000	1.5
@@ -1,48 +1,57 @@
-Name:           almanah
-Version:        0.5.0
-Release:        3%{?dist}
-Summary:        A application to allow you to keep a diary of your life
-
-Group:          Applications/Productivity
-License:        GPLv3+
-URL:            http://tecnocode.co.uk/projects/almanah/
-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 seahorse-devel
-
-Requires(pre):   GConf2
-Requires(post):  GConf2
-Requires(preun): GConf2
+Name:		almanah
+Version:	0.6.1
+Release:	2%{?dist}
+Summary:	Application for keeping an encrypted diary
+
+Group:		Applications/Productivity
+License:	GPLv3+
+URL:		http://tecnocode.co.uk/projects/almanah/
+Source0:	http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	gettext
+BuildRequires:	gpgme-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	gtkspell-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	intltool
+BuildRequires:	desktop-file-utils 
+BuildRequires:	evolution-devel
+BuildRequires:	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.
+Almanah Diary is a small application to ease the management of an encrypted
+personal diary. It's got good editing abilities, including text formatting 
+and printing. Evolution tasks and appointments will be listed to ease the 
+creation of diary entries related to them. At the same time, you can create
+diary entries using multiple events.
 
 %prep
 %setup -q
 chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h}
-sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in
-
+sed -e 's/_//' \
+    -e 's/=Diary/=Almanah/' \
+    -i data/%{name}.desktop.in
 
 %build
 %configure --enable-encryption --enable-spell-checking
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor="fedora"                     \
-  --delete-original                                        \
-  --dir=%{buildroot}%{_datadir}/applications               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre
@@ -55,18 +64,21 @@ 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 || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+
+
+%preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
@@ -78,18 +90,19 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/applications/%{name}.desktop
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-2
+- Cosmetic changes
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Nov 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-1
+- Update to new release
+- Fixed BuildRequires for new release
 
 * Wed Dec  3 2008 Jean-François Martin <lokthare at gmail.com> - 0.5.0-1
 - Update to the new release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2008 16:25:03 -0000	1.1
+++ import.log	8 Dec 2009 12:57:27 -0000	1.2
@@ -1 +1,2 @@
 almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644
+almanah-0_6_1-2_fc12:HEAD:almanah-0.6.1-2.fc12.src.rpm:1260277020


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2008 02:45:58 -0000	1.3
+++ sources	8 Dec 2009 12:57:27 -0000	1.4
@@ -1 +1 @@
-b6469a0a60b760798d3253ee77d6b9f4  almanah-0.5.0.tar.gz
+cca92b59002fa9e0515287f3df38cb1c  almanah-0.6.1.tar.gz


