[geany] New upstream release: Geany 1.22

[Dominic Hopf]

commit 4d8995f3112e9737da52e3e34e6d688f0383a75a
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Tue Jun 19 22:14:09 2012 +0200

    New upstream release: Geany 1.22
    
    - remove the previous patch to fix DSO linking, this is now included upstream
    - update upstream URLs for tags files

 .gitignore |    1 +
 geany.spec |   47 +++++++++++++++++++++++++----------------------
 sources    |    2 +-
 3 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d34bc0..ad9c7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ geany-0.19.tar.bz2
 /geany-0.19.2.tar.bz2
 /geany-0.20.tar.bz2
 /geany-0.21.tar.bz2
+/geany-1.22.tar.bz2
diff --git a/geany.spec b/geany.spec
index 2969da0..f5579b6 100644
--- a/geany.spec
+++ b/geany.spec
@@ -4,38 +4,37 @@
 %global  _python_bytecompile_errors_terminate_build 0
 
 Name:      geany
-Version:   0.21
-Release:   5%{?dist}
+Version:   1.22
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
 License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
-Patch0:    geany-fixdso.patch
 
 # The following tags files were retrieved 6th Jan 2011,
-Source1:   http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
-Source2:   http://download.geany.org/contrib/tags/drupal.php.tags
-Source3:   http://download.geany.org/contrib/tags/ethos-1.0.c.tags
-Source4:   http://download.geany.org/contrib/tags/geany-api-0.19.c.tags
-Source5:   http://download.geany.org/contrib/tags/gladeui-1.0.c.tags
-Source6:   http://download.geany.org/contrib/tags/gnt.c.tags
+Source1:   http://wiki.geany.org/_media/tags/dbus-glib-0.76.c.tags
+Source2:   http://wiki.geany.org/_media/tags/drupal.php.tags
+Source3:   http://wiki.geany.org/_media/tags/ethos-1.0.c.tags
+Source4:   http://wiki.geany.org/_media/tags/geany-api-0.21.c.tags
+Source5:   http://wiki.geany.org/_media/tags/gladeui-1.0.c.tags
+Source6:   http://wiki.geany.org/_media/tags/gnt.c.tags
 Source7:   http://wiki.geany.org/_media/tags/gtk_-2.24.c.tags
 Source8:   http://download.geany.org/contrib/tags/gtkscintilla-2.0.c.tags
-Source9:   http://download.geany.org/contrib/tags/gtksourceview-3.0.c.tags
-Source10:  http://download.geany.org/contrib/tags/libdevhelp-2.0.c.tags
-Source11:  http://download.geany.org/contrib/tags/libgdl-3.0.c.tags
-Source12:  http://download.geany.org/contrib/tags/libxml-2.0.c.tags
-Source13:  http://download.geany.org/contrib/tags/sqlite3.c.tags
-Source14:  http://download.geany.org/contrib/tags/standard.css.tags
-Source15:  http://download.geany.org/contrib/tags/std.glsl.tags
-Source16:  http://download.geany.org/contrib/tags/std.latex.tags
+Source9:   http://wiki.geany.org/_media/tags/gtksourceview-3.0.c.tags
+Source10:  http://wiki.geany.org/_media/tags/libdevhelp-2.0.c.tags
+Source11:  http://wiki.geany.org/_media/tags/libgdl-3.0.c.tags
+Source12:  http://wiki.geany.org/_media/tags/libxml-2.0.c.tags
+Source13:  http://wiki.geany.org/_media/tags/sqlite3.c.tags
+Source14:  http://wiki.geany.org/_media/tags/standard.css.tags
+Source15:  http://wiki.geany.org/_media/tags/std.glsl.tags
+Source16:  http://wiki.geany.org/_media/tags/std.latex.tags
 Source17:  http://download.geany.org/contrib/tags/std.vala.tags
-Source18:  http://download.geany.org/contrib/tags/v4l2.c.tags
-Source19:  http://download.geany.org/contrib/tags/webkit-1.0.c.tags
-Source20:  http://download.geany.org/contrib/tags/wordpress.php.tags
-Source21:  http://download.geany.org/contrib/tags/xfce48.c.tags
+Source18:  http://wiki.geany.org/_media/tags/v4l2.c.tags
+Source19:  http://wiki.geany.org/_media/tags/webkit-1.0.c.tags
+Source20:  http://wiki.geany.org/_media/tags/wordpress.php.tags
+Source21:  http://wiki.geany.org/_media/tags/xfce48.c.tags
 Source22:  http://advamacs.com/pub/tcl.tcl.tags
 
 
@@ -73,7 +72,6 @@ Geany plug-ins. You do not need to install this package to use Geany.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdso
 
 # remove waf since this isn't needed for the build, we're building the package
 # with autotools
@@ -141,6 +139,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Tue Jun 19 2012 Dominic Hopf <dmaphy at fedoraproject.org> - 1.22-1
+- New upstream release: Geany 1.22
+- remove the previous patch to fix DSO linking, this is now included upstream
+- update upstream URLs for tags files
+
 * Mon May 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.21-5
 - Add patch to fix FTBFS due to DSO linking, spec cleanup
 
diff --git a/sources b/sources
index d630ee2..156ee61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-117d78ae5275c8c517686b6db9d71ef1  geany-0.21.tar.bz2
+0672077fe83e2a739aa0eaca426aacf0  geany-1.22.tar.bz2