[geany-plugins/f14/master: 14/14] - require and build against Geany 0.20 - apply patch from upstream SVN to fix geanylua build

[Dominic Hopf]

commit 9c46d87abe27d3a5d504db4a8f3b97cc00872a34
Merge: 09f1200 b493f8a
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat Jan 8 16:27:51 2011 +0100

    - require and build against Geany 0.20
    - apply patch from upstream SVN to fix geanylua build

 .gitignore                                 |    4 +-
 geany-plugins-0.19-geanylua-fixbuild.patch |  110 ++++++++++++++++++++++++++++
 geany-plugins.spec                         |   14 +++-
 3 files changed, 125 insertions(+), 3 deletions(-)
---
diff --cc geany-plugins.spec
index cc905e6,08daf35..b82247d
--- a/geany-plugins.spec
+++ b/geany-plugins.spec
@@@ -3,13 -3,21 +3,17 @@@
  
  Name:           geany-plugins
  Version:        0.19
- Release:        4%{?dist}
 -Release:        7%{?dist}
++Release:        5%{?dist}
  Summary:        Plugins for Geany
  
  Group:          Development/Tools
  License:        GPLv3+
  URL:            http://plugins.geany.org/
  Source0:        http://plugins.geany.org/geany-plugins/geany-plugins-%{version}.tar.bz2
+ 
 -# Patch contains backported upstream changes for geanygendoc plugin to work
 -# with CTPL 0.3
 -Patch0:         geany-plugins-0.19-geanygendoc-backport-use-ctpl-0.3.patch
 -
+ # Patch fixes build of the geanylua plugin, applied from upstream svn rev 1509
 -Patch1:         geany-plugins-0.19-geanylua-fixbuild.patch
++Patch0:         geany-plugins-0.19-geanylua-fixbuild.patch
+ 
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  geany-devel >= %{req_geany_ver} gettext intltool pkgconfig
@@@ -286,6 -295,15 +290,8 @@@ Plugin for Geany to easily beautify XM
  %prep
  %setup -q
  
 -# the patch creates a new README file, thus we can delete the one delivered
 -# with the tarball
 -rm geanygendoc/README
 -%patch0 -p2
 -%patch1 -p0
++%patch0 -p0
+ 
 -# need to run autoreconf since the previous patch manipulates also the build
 -# system
 -autoreconf -v -f -i
  
  %build
  %configure --docdir=%{geany_plug_docdir}
@@@ -422,6 -440,15 +428,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Sat Jan 08 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-7
 -- apply patch from upstream SVN to fix geanylua build
 -
 -* Thu Jan 06 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-6
++* Sat Jan 08 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-5
+ - require and build against Geany 0.20
 -
 -* Tue Oct 26 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-5
 -- backport upstream changes for geanygendoc to work with CTPL 0.3
++- apply patch from upstream SVN to fix geanylua build
+ 
  * Sat Oct 09 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-4
  - remove Requires: geany >= %%{req_geany_ver} from plugins, since Geany is
    required by geany-plugins-common, and any plugin requires the common