[geany-plugins] - backport upstream changes for geanygendoc to work with CTPL 0.3

Dominic Hopf dmaphy at fedoraproject.org
Tue Oct 26 23:10:42 UTC 2010


commit c1d34e5429a088a9ecc4bfbd2a62e8c08b23aa75
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Wed Oct 27 01:10:39 2010 +0200

    - backport upstream changes for geanygendoc to work with CTPL 0.3

 geany-plugins.spec |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/geany-plugins.spec b/geany-plugins.spec
index cc905e6..6d846db 100644
--- a/geany-plugins.spec
+++ b/geany-plugins.spec
@@ -3,20 +3,25 @@
 
 Name:           geany-plugins
 Version:        0.19
-Release:        4%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  geany-devel >= %{req_geany_ver} gettext intltool pkgconfig
 BuildRequires:  lua-devel >= 5.1
 BuildRequires:  enchant-devel >= 1.3 gtkspell-devel >= 2.0
 BuildRequires:  libxml2-devel >= 2.6.27
-BuildRequires:  ctpl-devel >= 0.2
+BuildRequires:  ctpl-devel >= 0.3
+BuildRequires:  libtool
 
 %description
 Plugins for Geany. Plugins included are:
@@ -114,7 +119,7 @@ through API documentation.
 Summary:   Automatically generate documentation source code
 Group:     Development/Tools
 Requires:  geany-plugins-common = %{version}-%{release}
-Requires:  ctpl-libs
+Requires:  ctpl-libs >= 0.3
 
 %description geanygendoc
 GeanyGenDoc is a plugin for Geany that aims to automatically generate
@@ -286,6 +291,14 @@ Plugin for Geany to easily beautify XML code.
 %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
+
+# 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 +435,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 26 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 0.19-5
+- backport upstream changes for geanygendoc to work with CTPL 0.3
+
 * 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


More information about the scm-commits mailing list