From ee538f1e8463e909e7e54e722adf004f0ca5fb59 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Mar 26 2009 20:29:52 +0000
Subject: - version 0.4.0

- drop patch0 (upstream)

---

diff --git a/.cvsignore b/.cvsignore
index b70f46d..7eb5d61 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-KeePassX-0.3.4.tar.gz
+keepassx-0.4.0.tar.bz2
diff --git a/keepassx-0.3.4-rhbz489820.patch b/keepassx-0.3.4-rhbz489820.patch
deleted file mode 100644
index e7a05a0..0000000
--- a/keepassx-0.3.4-rhbz489820.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trunk/src/Kdb3Database.cpp	2009/03/11 21:18:28	280
-+++ trunk/src/Kdb3Database.cpp	2009/03/11 23:52:42	281
-@@ -1364,14 +1364,14 @@
- 
- 	for(int i=0; i < UnknownMetaStreams.size(); i++){
- 		FileSize
--			+=164
-+			+=165
- 			+UnknownMetaStreams[i].Comment.toUtf8().length()+1
- 			+UnknownMetaStreams[i].Binary.length();
- 	}
- 
- 	for(int i=0; i < MetaStreams.size(); i++){
- 		FileSize
--				+=164
-+				+=165
- 				+MetaStreams[i].Comment.toUtf8().length()+1
- 				+MetaStreams[i].Binary.length();
- 	}
diff --git a/keepassx.spec b/keepassx.spec
index a68c531..3b7cb41 100644
--- a/keepassx.spec
+++ b/keepassx.spec
@@ -1,14 +1,12 @@
 Name:           keepassx
-Version:        0.3.4
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
-Source0:        http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz
-# Fix from upstream: https://bugzilla.redhat.com/show_bug.cgi?id=489820
-Patch0:         keepassx-0.3.4-rhbz489820.patch
+Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.bz2
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,7 +34,6 @@ that is compatible with KeePass Password Safe for MS Windows.
 
 %prep
 %setup -q
-%patch0 -p1 -b .rhbz489820
 %patch1 -p0 -b .gcc43
 
 
@@ -81,18 +78,20 @@ install -D -m 644 -p x-keepass.desktop \
 
 
 %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
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %clean
@@ -106,10 +105,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/keepassx
 %{_datadir}/applications/*.desktop
 %{_datadir}/mimelnk/application/*.desktop
+%{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/*/apps/keepassx.png
 
 
 %changelog
+* Thu Mar 26 2009 Aurelien Bompard <abompard@fedoraproject.org> 0.4.0-1
+- version 0.4.0
+- drop patch0 (upstream)
+
 * Thu Mar 12 2009 Aurelien Bompard <abompard@fedoraproject.org> 0.3.4-3
 - backport fix from upstream for bug #489820
 
diff --git a/sources b/sources
index 3dac928..0130bc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-437fee5ff43dd4f0017f4fb51eef8f6f  KeePassX-0.3.4.tar.gz
+0167d8fc0d2180621d451f0af89be9a6  keepassx-0.4.0.tar.bz2