From 34c41077167898b39d9b90bd9346d35eb9ed2c30 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Aug 2010 22:30:49 +0000 Subject: [PATCH 1/6] Accepting request 43834 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/anjuta via accept of submit request 43834 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/43834 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=58 --- anjuta.changes | 6 ++++++ anjuta.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/anjuta.changes b/anjuta.changes index 87dbee7..1885388 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 23 11:12:17 UTC 2010 - dimstar@opensuse.org + +- bnc#624924: Anjuta crashes on startup on loading symbol-db + plugin. --> Require: libgda-sqlite. + ------------------------------------------------------------------- Fri Jun 4 17:29:29 CEST 2010 - sbrabec@suse.cz diff --git a/anjuta.spec b/anjuta.spec index b8bbd44..f258d83 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -62,6 +62,8 @@ Requires: autogen Requires: automake Requires: gettext Requires: libtool +# Require libgda-sqlite: the sybol-db requires it. See bnc#624924. +Requires: libgda-sqlite BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq From c2f68cd8e8236b9a99ec89fa298fd0ae4808f0b1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Aug 2010 22:32:42 +0000 Subject: [PATCH 2/6] Accepting request 44628 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/anjuta via accept of submit request 44628 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44628 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=59 --- anjuta.changes | 4 ++-- anjuta.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anjuta.changes b/anjuta.changes index 1885388..665d83a 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Jul 23 11:12:17 UTC 2010 - dimstar@opensuse.org -- bnc#624924: Anjuta crashes on startup on loading symbol-db - plugin. --> Require: libgda-sqlite. +- 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 diff --git a/anjuta.spec b/anjuta.spec index f258d83..245f758 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -62,7 +62,7 @@ Requires: autogen Requires: automake Requires: gettext Requires: libtool -# Require libgda-sqlite: the sybol-db requires it. See bnc#624924. +# libgda-sqlite is needed by the symbol-db plugin. See bnc#624924. Requires: libgda-sqlite BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq From 896c9191a6af97cbf3abdb487c874271825030b2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 20:49:14 +0000 Subject: [PATCH 3/6] Accepting request 44764 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/anjuta via accept of submit request 44764 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44764 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=60 --- anjuta-2.30.1.0.tar.bz2 | 3 --- anjuta-2.31.6.1.tar.bz2 | 3 +++ anjuta-fix-warning.patch | 24 ++++++++++++++++++++ anjuta-old-glade3.patch | 26 ++++++++++++++++++++++ anjuta.changes | 47 ++++++++++++++++++++++++++++++++++++++++ anjuta.spec | 19 +++++++++++----- 6 files changed, 113 insertions(+), 9 deletions(-) delete mode 100644 anjuta-2.30.1.0.tar.bz2 create mode 100644 anjuta-2.31.6.1.tar.bz2 create mode 100644 anjuta-fix-warning.patch create mode 100644 anjuta-old-glade3.patch diff --git a/anjuta-2.30.1.0.tar.bz2 b/anjuta-2.30.1.0.tar.bz2 deleted file mode 100644 index cc87ff7..0000000 --- a/anjuta-2.30.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1 -size 9404450 diff --git a/anjuta-2.31.6.1.tar.bz2 b/anjuta-2.31.6.1.tar.bz2 new file mode 100644 index 0000000..dc16314 --- /dev/null +++ b/anjuta-2.31.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b82856b27ac4d0aff98ab5423659ffde36d5548e2c98a46a42c852283184081e +size 9928060 diff --git a/anjuta-fix-warning.patch b/anjuta-fix-warning.patch new file mode 100644 index 0000000..aff70ac --- /dev/null +++ b/anjuta-fix-warning.patch @@ -0,0 +1,24 @@ +From 8397b0815ba96e2b0f6e81431b1260997e04ca80 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +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 + + #include ++#include + + #include + +-- +1.7.1 + diff --git a/anjuta-old-glade3.patch b/anjuta-old-glade3.patch new file mode 100644 index 0000000..14c6c78 --- /dev/null +++ b/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 diff --git a/anjuta.changes b/anjuta.changes index 665d83a..4b2178b 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +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 diff --git a/anjuta.spec b/anjuta.spec index 245f758..1332270 100644 --- a/anjuta.spec +++ b/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,14 +18,18 @@ Name: anjuta -Version: 2.30.1.0 -Release: 2 +Version: 2.31.6.1 +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 @@ -51,6 +55,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 @@ -110,6 +115,8 @@ and can be unfriendly to use. %prep %setup -q translation-update-upstream +%patch0 -p1 +%patch1 -p1 %build %configure\ @@ -166,10 +173,10 @@ fi %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/anjuta # Somehow I think that this is wrong. -%dir %{_datadir}/icons/gnome/48x48/mimetypes/ -%{_datadir}/icons/gnome/48x48/mimetypes/*.png +%dir %{_datadir}/icons/gnome/*/mimetypes/ +%{_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/* From 3c7d350a5c5776c2c851edca70d24f456fcb5ada Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 8 Aug 2010 12:52:01 +0000 Subject: [PATCH 4/6] Accepting request 44887 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/anjuta via accept of submit request 44887 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44887 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=61 --- anjuta.changes | 5 +++++ anjuta.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/anjuta.changes b/anjuta.changes index 4b2178b..62b697b 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/anjuta.spec b/anjuta.spec index 1332270..6212805 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -35,6 +35,7 @@ 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 From 4e604c175cca04f90d00059537f338ea4d59a7d9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 22:42:16 +0000 Subject: [PATCH 5/6] Accepting request 45023 from GNOME:Factory checked in (request 45023) OBS-URL: https://build.opensuse.org/request/show/45023 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=62 --- anjuta-2.30.1.0.tar.bz2 | 3 +++ anjuta-2.31.6.1.tar.bz2 | 3 --- anjuta-fix-warning.patch | 24 ----------------- anjuta-old-glade3.patch | 26 ------------------ anjuta.changes | 58 ---------------------------------------- anjuta.spec | 22 +++++---------- 6 files changed, 9 insertions(+), 127 deletions(-) create mode 100644 anjuta-2.30.1.0.tar.bz2 delete mode 100644 anjuta-2.31.6.1.tar.bz2 delete mode 100644 anjuta-fix-warning.patch delete mode 100644 anjuta-old-glade3.patch diff --git a/anjuta-2.30.1.0.tar.bz2 b/anjuta-2.30.1.0.tar.bz2 new file mode 100644 index 0000000..cc87ff7 --- /dev/null +++ b/anjuta-2.30.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1 +size 9404450 diff --git a/anjuta-2.31.6.1.tar.bz2 b/anjuta-2.31.6.1.tar.bz2 deleted file mode 100644 index dc16314..0000000 --- a/anjuta-2.31.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b82856b27ac4d0aff98ab5423659ffde36d5548e2c98a46a42c852283184081e -size 9928060 diff --git a/anjuta-fix-warning.patch b/anjuta-fix-warning.patch deleted file mode 100644 index aff70ac..0000000 --- a/anjuta-fix-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8397b0815ba96e2b0f6e81431b1260997e04ca80 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -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 - - #include -+#include - - #include - --- -1.7.1 - diff --git a/anjuta-old-glade3.patch b/anjuta-old-glade3.patch deleted file mode 100644 index 14c6c78..0000000 --- a/anjuta-old-glade3.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 diff --git a/anjuta.changes b/anjuta.changes index 62b697b..87dbee7 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,61 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/anjuta.spec b/anjuta.spec index 6212805..b8bbd44 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 2.31.6.1) +# spec file for package anjuta (Version 2.30.1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,24 +18,19 @@ Name: anjuta -Version: 2.31.6.1 -Release: 1 +Version: 2.30.1.0 +Release: 2 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 @@ -56,7 +51,6 @@ 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 @@ -68,8 +62,6 @@ 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 @@ -116,8 +108,6 @@ and can be unfriendly to use. %prep %setup -q translation-update-upstream -%patch0 -p1 -%patch1 -p1 %build %configure\ @@ -174,10 +164,10 @@ fi %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/anjuta # Somehow I think that this is wrong. -%dir %{_datadir}/icons/gnome/*/mimetypes/ -%{_datadir}/icons/gnome/*/mimetypes/*.png +%dir %{_datadir}/icons/gnome/48x48/mimetypes/ +%{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_datadir}/icons/gnome/scalable/mimetypes/*.svg -%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/48x48/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg %doc %{_mandir}/man?/*.* %{_libdir}/glade3/modules/* From 3aad1331e952cff77f2ede231334c790e3b60478 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 22:42:17 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/anjuta revision 48.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=ff2f84eefef4c0c2b5e5149a5b079284 --- anjuta-2.30.1.0.tar.bz2 | 3 --- anjuta-2.31.6.1.tar.bz2 | 3 +++ anjuta-fix-warning.patch | 24 +++++++++++++++++ anjuta-old-glade3.patch | 26 ++++++++++++++++++ anjuta.changes | 58 ++++++++++++++++++++++++++++++++++++++++ anjuta.spec | 22 ++++++++++----- 6 files changed, 127 insertions(+), 9 deletions(-) delete mode 100644 anjuta-2.30.1.0.tar.bz2 create mode 100644 anjuta-2.31.6.1.tar.bz2 create mode 100644 anjuta-fix-warning.patch create mode 100644 anjuta-old-glade3.patch diff --git a/anjuta-2.30.1.0.tar.bz2 b/anjuta-2.30.1.0.tar.bz2 deleted file mode 100644 index cc87ff7..0000000 --- a/anjuta-2.30.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1 -size 9404450 diff --git a/anjuta-2.31.6.1.tar.bz2 b/anjuta-2.31.6.1.tar.bz2 new file mode 100644 index 0000000..dc16314 --- /dev/null +++ b/anjuta-2.31.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b82856b27ac4d0aff98ab5423659ffde36d5548e2c98a46a42c852283184081e +size 9928060 diff --git a/anjuta-fix-warning.patch b/anjuta-fix-warning.patch new file mode 100644 index 0000000..aff70ac --- /dev/null +++ b/anjuta-fix-warning.patch @@ -0,0 +1,24 @@ +From 8397b0815ba96e2b0f6e81431b1260997e04ca80 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +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 + + #include ++#include + + #include + +-- +1.7.1 + diff --git a/anjuta-old-glade3.patch b/anjuta-old-glade3.patch new file mode 100644 index 0000000..14c6c78 --- /dev/null +++ b/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 diff --git a/anjuta.changes b/anjuta.changes index 87dbee7..62b697b 100644 --- a/anjuta.changes +++ b/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 diff --git a/anjuta.spec b/anjuta.spec index b8bbd44..6212805 100644 --- a/anjuta.spec +++ b/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 -Release: 2 +Version: 2.31.6.1 +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/ -%{_datadir}/icons/gnome/48x48/mimetypes/*.png +%dir %{_datadir}/icons/gnome/*/mimetypes/ +%{_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/*