Accepting request 45023 from GNOME:Factory

Copy from GNOME:Factory/anjuta based on submit request 45023 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/45023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=48

anjuta-2.30.1.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1
-size 9404450

anjuta-2.31.6.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b82856b27ac4d0aff98ab5423659ffde36d5548e2c98a46a42c852283184081e
+size 9928060

anjuta-fix-warning.patch

@@ -0,0 +1,24 @@
+From 8397b0815ba96e2b0f6e81431b1260997e04ca80 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Fri, 6 Aug 2010 21:14:48 +0200
+Subject: [PATCH] class-gen: add missing include
+
+---
+ plugins/class-gen/generator.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/class-gen/generator.c b/plugins/class-gen/generator.c
+index 242a510..27a2ab3 100644
+--- a/plugins/class-gen/generator.c
++++ b/plugins/class-gen/generator.c
+@@ -22,6 +22,7 @@
+ #include <plugins/project-wizard/autogen.h>
+ 
+ #include <libanjuta/anjuta-marshal.h>
++#include <libanjuta/anjuta-utils.h>
+ 
+ #include <glib/gstdio.h>
+ 
+-- 
+1.7.1
+

anjuta-old-glade3.patch

@@ -0,0 +1,26 @@
+Index: anjuta-2.31.6.1/configure
+===================================================================
+--- anjuta-2.31.6.1.orig/configure
++++ anjuta-2.31.6.1/configure
+@@ -2852,7 +2852,7 @@ GTKSOURCEVIEW_REQUIRED=2.9.7
+ 
+ LIBDEVHELP_REQUIRED=0.22
+ 
+-GLADEUI_REQUIRED=3.7.1
++GLADEUI_REQUIRED=3.6.0
+ 
+ VALA_REQUIRED=0.9.4
+ 
+Index: anjuta-2.31.6.1/configure.in
+===================================================================
+--- anjuta-2.31.6.1.orig/configure.in
++++ anjuta-2.31.6.1/configure.in
+@@ -42,7 +42,7 @@ dnl Devhelp
+ LIBDEVHELP_REQUIRED=0.22
+ 
+ dnl Glade
+-GLADEUI_REQUIRED=3.7.1
++GLADEUI_REQUIRED=3.6.0
+ 
+ dnl Vala
+ VALA_REQUIRED=0.9.4

anjuta.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Sun Aug  8 14:22:18 CEST 2010 - vuntz@opensuse.org
+
+- Add explicit gconf2-devel BuildRequires.
+
+-------------------------------------------------------------------
+Fri Aug  6 18:05:42 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.31.6.1:
+  + Bugs fixed: bgo#625964, bgo#621919
+- Changes from version 2.31.6:
+  + Updated:
+    - Debugger is now much more polished
+    - Project wizard shows better package chooser
+  + Bugs fixed: bgo#625841, bgo#625604, bgo#625605, bgo#625350,
+    bgo#558954, bgo#624660, bgo#515395, bgo#598187, bgo#624091,
+    bgo#516112
+- Changes from version 2.31.5:
+  + New:
+    - Debugger supports pretty-printing now
+  + Updated:
+    - More work on the symbol database code quality and performance
+  + Bugs fixed: bgo#623754, bgo#623944, bgo#494292, bgo#617323,
+    bgo#612453, bgo#622706, bgo#617472, bgo#622526, bgo#619253,
+    bgo#621678, bgo#622139, bgo#621512, bgo#620927, bgo#620664
+- Changes from version 2.31.3:
+  + New:
+    - language-support for Vala
+  + Updated:
+    - Symbol database is super fast now
+    - Glade plugins was cleaned a lot and doesn't spit warnings
+      anymore
+  + Bugs fixed: bgo#618273, bgo#586428, bgo#618955, bgo#620209,
+    bgo#610934, bgo#572754
+- Changes from version 2.31.2:
+  + New:
+    - class-inheritance is included using libfoocanvas
+  + Bugs fixed: bgo#616810, bgo#618314, bgo#617433, bgo#615429,
+    bgo#615428
+- Changes from version 2.31.1:
+  + New:
+    - Symbol-db tree model with direct database access. This brings
+      faster a faster and more up-to-date symbol tree
+  + Bugs fixed: bgo#616780, bgo#616739, bgo#616503, bgo#616435,
+    bgo#550027, bgo#586689, bgo#613962, bgo#614906, bgo#614408,
+    bgo#500962, bgo#611834, bgo#613118
+- Add vala-devel BuildRequires to build vala support.
+- Add anjuta-old-glade3.patch to not require a glade3 version we
+  won't have this cycle.
+- Add anjuta-fix-warning.patch to add a missing include that breaks
+  the build.
+
+-------------------------------------------------------------------
+Fri Jul 23 11:12:17 UTC 2010 - dimstar@opensuse.org
+
+- Add libgda-sqlite Requires to fix crash on startup with the
+  symbol-db plugin (bnc#624924).
+
 -------------------------------------------------------------------
 Fri Jun  4 17:29:29 CEST 2010 - sbrabec@suse.cz
 

anjuta.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package anjuta (Version 2.30.1.0)
+# spec file for package anjuta (Version 2.31.6.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,19 +18,24 @@
 
 
 Name:           anjuta
-Version:        2.30.1.0
+Version:        2.31.6.1
-Release:        2
+Release:        1
 License:        GPLv2+
 Summary:        GNOME IDE for C and C++
 Url:            http://anjuta.sourceforge.net/
 Group:          Development/Tools/IDE
 Source:         anjuta-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM anjuta-old-glade3.patch bgo626260 vuntz@opensuse.org -- Do not require a too recent version of glade3
+Patch0:         anjuta-old-glade3.patch
+# PATCH-FIX-UPSTREAM anjuta-fix-warning.patch bgo626265 vuntz@opensuse.org -- Add missing include
+Patch1:         anjuta-fix-warning.patch
 BuildRequires:  autogen
 BuildRequires:  binutils-devel
 BuildRequires:  devhelp-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  gconf2-devel
 BuildRequires:  gdl-devel
 BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
@@ -51,6 +56,7 @@ BuildRequires:  shared-mime-info
 BuildRequires:  subversion-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  vala-devel
 %ifnarch ia64 s390 s390x
 BuildRequires:  valgrind-devel
 %endif
@@ -62,6 +68,8 @@ Requires:       autogen
 Requires:       automake
 Requires:       gettext
 Requires:       libtool
+# libgda-sqlite is needed by the symbol-db plugin. See bnc#624924.
+Requires:       libgda-sqlite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
@@ -108,6 +116,8 @@ and can be unfriendly to use.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure\
@@ -164,10 +174,10 @@ fi
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/pixmaps/anjuta
 # Somehow I think that this is wrong.
-%dir %{_datadir}/icons/gnome/48x48/mimetypes/
+%dir %{_datadir}/icons/gnome/*/mimetypes/
-%{_datadir}/icons/gnome/48x48/mimetypes/*.png
+%{_datadir}/icons/gnome/*/mimetypes/*.png
 %{_datadir}/icons/gnome/scalable/mimetypes/*.svg
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %doc %{_mandir}/man?/*.*
 %{_libdir}/glade3/modules/*