rpms/akonadi/F-9 .cvsignore, 1.4, 1.5 akonadi.spec, 1.7, 1.8 sources, 1.4, 1.5 akonadi-1.1.1-startup-2.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23881

Modified Files:
	.cvsignore akonadi.spec sources 
Removed Files:
	akonadi-1.1.1-startup-2.patch 
Log Message:
* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
- akonadi-1.1.2
- optimize scriptlets a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Mar 2009 16:36:22 -0000	1.4
+++ .cvsignore	3 May 2009 02:59:27 -0000	1.5
@@ -1 +1 @@
-akonadi-1.1.1.tar.bz2
+akonadi-1.1.2.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-9/akonadi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- akonadi.spec	14 Mar 2009 16:36:22 -0000	1.7
+++ akonadi.spec	3 May 2009 02:59:27 -0000	1.8
@@ -1,12 +1,13 @@
+
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.1
-Release: 6%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-Source0:  http://akonadi.omat.nl/akonadi-%{version}.tar.bz2
+Source0:  http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -14,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream
-# http://websvn.kde.org/branches/akonadi/1.1/server/src/akonadi.cpp?r1=905029&r2=931467&view=patch
-Patch100: akonadi-1.1.1-startup-2.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -33,7 +32,6 @@ Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
 Requires(hint): mysql-server
 
-Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -58,7 +56,6 @@ Requires: pkgconfig
 
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
-%patch100 -p3 -b .startup-2
 
 
 %build
@@ -85,13 +82,16 @@ touch -d %{mysql_conf_timestamp} $RPM_BU
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+  update-mime-database %{_datadir}/mime &> /dev/null ||:
+fi
 
 
 %files
@@ -118,6 +118,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
+- akonadi-1.1.2
+- optimize scriptlets a bit
+
 * Wed Feb 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-6
 - rev startup patch
 - BR: cmake >= 2.6.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Jan 2009 10:57:58 -0000	1.4
+++ sources	3 May 2009 02:59:27 -0000	1.5
@@ -1 +1 @@
-2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2
+5651b02358f7d2f1c0954dfd31feafb1  akonadi-1.1.2.tar.bz2


--- akonadi-1.1.1-startup-2.patch DELETED ---