From c6e80c154f8498fa86b4bcaaf49ff67942bd0e99 Mon Sep 17 00:00:00 2001
From: Dominic Hopf <dmaphy@fedoraproject.org>
Date: Sat, 12 Jun 2010 21:20:45 +0000
Subject: [PATCH] Update to new upstream release: Geany 0.19

---
 .cvsignore                                        |  2 +-
 ...isk-and-add-mimetypes-for-php3-php4-php5.patch | 11 -----------
 geany.spec                                        | 15 ++++++++-------
 sources                                           |  2 +-
 4 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch

diff --git a/.cvsignore b/.cvsignore
index a28babc..4507946 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-geany-0.18.1.tar.bz2
+geany-0.19.tar.bz2
diff --git a/geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch b/geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch
deleted file mode 100644
index 856a210..0000000
--- a/geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: geany.desktop.in
-===================================================================
---- geany.desktop.in	(Revision 4821)
-+++ geany.desktop.in	(Arbeitskopie)
-@@ -8,5 +8,5 @@
- Icon=geany
- Terminal=false
- Categories=GTK;Development;IDE;
--MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
-+MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;
- StartupNotify=true
diff --git a/geany.spec b/geany.spec
index ca63c53..f14fdda 100644
--- a/geany.spec
+++ b/geany.spec
@@ -1,8 +1,11 @@
 %global geany_docdir %{_docdir}/%{name}-%{version}
 
+# The  Python templates in /usr/share/geany/templates can not be byte-compiled.
+%global  _python_bytecompile_errors_terminate_build 0
+
 Name:      geany
-Version:   0.18.1
-Release:   3%{?dist}
+Version:   0.19
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -24,9 +27,6 @@ Source10:  http://download.geany.org/contrib/tags/std.latex.tags
 Source11:  http://download.geany.org/contrib/tags/libxml-2.0.c.tags
 Source12:  http://advamacs.com/pub/tcl.tcl.tags
 
-# The patch is already applied in upstream SVN
-Patch0:    geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel, intltool
@@ -68,8 +68,6 @@ Geany plug-ins. You do not need to install this package to use Geany.
 rm -f waf
 rm -f wscript
 
-%patch0
-
 
 %build
 %configure --docdir=%{geany_docdir}
@@ -132,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sat Jun 12 2010 Dominic Hopf <dmaphy@fedoraproject.org> - 0.19
+- New upstream release: Geany 0.19
+
 * Sun Apr 18 2010 Dominic Hopf <dmaphy@fedoraproject.org> - 0.18.1-3
 - improve handling of documentation directory
 - add upstream comment about the desktopfile patch
diff --git a/sources b/sources
index 519664c..5826f2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8be4c0918a8b29ef43bf17fa080c11c  geany-0.18.1.tar.bz2
+3f9ab0faea72b1c8e25fe50162c42f95  geany-0.19.tar.bz2