From 74a25b91f5a50a3fb839204f95570ea328bf4606 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 27 Apr 2011 12:16:26 +0000 Subject: [PATCH] Accepting request 68551 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68551 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=81 --- anjuta.changes | 212 ++++++++++++------------------------------------- anjuta.spec | 52 +++++++----- 2 files changed, 83 insertions(+), 181 deletions(-) diff --git a/anjuta.changes b/anjuta.changes index eff204c..91a4f8d 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,13 +1,22 @@ +------------------------------------------------------------------- +Wed Apr 27 13:53:09 CEST 2011 - vuntz@opensuse.org + +- Add gobject-introspection-devel BuildRequires to build + introspection support. +- Remove now unneeded BuildRequires: libwnck-devel. +- Move to pkgconfig()-style BuildRequires: + + Old ones: devhelp-devel, gdl-devel, graphviz-devel, + gtksourceview-devel, libgda-4_0-devel, libgladeui-1_0-devel, + libneon-devel. + + New ones: glib-2.0, gdk-pixbuf-2.0, gdl-3.0, gladeui-2.0, + gtk+-3.0, gtksourceview-3.0, libdevhelp-3.0, libgda-4.0, + libgraph, libgvc, libxml-2.0, neon. + ------------------------------------------------------------------- Tue Apr 5 15:59:21 UTC 2011 - fcrozat@novell.com - Update to version 3.0.0.0: - + bgo645470: Anjuta from git master still creates Vala projects - using GTK 2. - + bgo#645557: Autogenerated PyGTK projects have wrong path to UI - file. - + bgo#646530: Anjuta crashes when closing tab other than - current. + + Bugs fixed: bgo#645470, bgo#645557, bgo#646530. + Updated translations. ------------------------------------------------------------------- @@ -16,96 +25,33 @@ Wed Mar 23 09:51:45 UTC 2011 - fcrozat@novell.com - Update to version 2.91.92.0: + Lots of little fixes on the templates + Bugs fixed: - - bgo#643379: Glade drag and drop support for Vala - - bgo#307515: drag and drop variable symbol onto watches for - simple expressions. - - bgo#336856: Search and replace is not simple - bgo#565275: Quick Search should be able to search backward - bgo#565276: highlight all matches in Quick Search - - bgo#638134: Redesign of Single and Multi-File Search & - Replace. - - bgo#645311: Adjust to GtkSourceView API break - - bgo#644050: Some strings are not marked for translation in - the .ui file. - - bgo#643621: Anjuta catalog makes glade complain. - - bgo#644595: Patches from Mandriva package - - bgo#645049: Password detection not working on non-english - locales. - - bgo#645076: Run dialog doesn't work with python project - - bgo#570912: Cannot remove module/package - - bgo#644294: old version of gtk+ specified for gtkmm projects + - bgo#643379, bgo#307515, bgo#336856, bgo#638134, bgo#645311, + bgo#644050, bgo#643621, bgo#644595, bgo#645049, bgo#645076, + bgo#570912, bgo#644294. - Changes from version 2.91.91: + New: - Signal dragging support for Vala - Improved C++ signal dropping features - Regular expression inline search - + Bugs fixed: - - bgo#623735: Move pkg-config symbol parsing to - language-support-cpp-java. - - bgo#638836: language-support-vala: refactor to work with - latest project manager. - - bgo#336856: Search and replace is not simple - - bgo#565275 Quick Search should be able to search backward. - - bgo#565276: highlight all matches in Quick Search. - - bgo#568047: Glade plugin does not allow adding notebook - containers with less than 3 tabs. - - bgo#638134: Redesign of Single and Multi-File Search & - Replace. - - bgo#643205: Updates symbols on glade signal drop. - - bgo#644014: Typo at translation message - - bgo#640545: File-wizard screws up file notice - - bgo#642763: Fix memory in message-view plugin - - bgo#627105: Mark default diff filenames for translation - - bgo#642749: Status window doesn't work - - bgo#643707: Please remove unnecessary markup from .ui files. - - bgo#644050: Some strings are not marked for translation in - the .ui file. - - bgo#636410: Unable to delete data target - - bgo#639440: [PATCH] Strings not translated when plugin - manager is used form apps. - - bgo#643245: Create a prototype in the header file when a - signal is dropped in a C source file. - - bgo#643828: A few typos - - bgo#641331: Add a (non-alphabetical) sorting order to wizard - files + + Bugs fixed: bgo#623735, bgo#638836, bgo#336856, bgo#565275, + bgo#565276, bgo#568047, bgo#638134, bgo#643205, bgo#644014, + bgo#640545, bgo#642763, bgo#627105, bgo#642749, bgo#643707, + bgo#644050, bgo#636410, bgo#639440, bgo#643245, bgo#643828, + bgo#641331. - Changes from 2.91.90: + New: - Signal dragging support for python - Glade usuability fixes - - New inline search/replace from Eugenia + - New inline search/replace + Bugs fixed: - bgo#530060 Have a "replace all" option in search and replace. - - bgo#553772 Unable to move or resize widget placed inside a - layout widget. - - bgo#568047 Glade plugin does not allow adding notebook - containers with less than 3 tabs. - - bgo#631260 Composer window broken after defining ActionGroup. - - bgo#633786 plugin.c:59: warning: implicit declaration of - function 'PyString_FromString' when compiling anjuta. - - bgo#642647 Crash if anjuta is launched with a project that - needs the glade plugin. - - bgo#642719 Prototype generator for C header files. - - bgo#638787 wrong set on gtk_source_view_set_smart_home_end. - - bgo#642763 Fix memory in message-view plugin - - bgo#516685 New artwork for splash screen - - bgo#549440 LIBADD is added at the wrong position in - Makefile.am if it doesn't exist. - - bgo#565358 documentation files appear in "other files" - target. - - bgo#566248 ianjuta_project_manager_get_elements returns weird - data. - bgo#569992 support makefiles named GNUmakefile.am - - bgo#637981 Port Makefile backend to the new API - - bgo#640969 Allow importing projects with 3rd party project - backends. - - bgo#641181 error building out-of-tree plugins that only - include libanjuta/libanjuta.h - - bgo#642640 NULL pointer dereference and memory leak in - parameter.c. - - bgo#642750 [PATCH] NULL pointer dereference in - anjuta-tabber.c. - - bgo#570912 Cannot remove module/package - - bgo#642723 Small in C header template + - bgo#553772, bgo#568047, bgo#631260, bgo#633786, bgo#642647, + bgo#642719, bgo#638787, bgo#642763, bgo#516685, bgo#549440, + bgo#565358, bgo#566248, bgo#637981, bgo#640969, bgo#641181, + bgo#642640, bgo#642750, bgo#570912, bgo#642723. - Changes from version 2.91.6: + New: - Support for dragging signals from glade into the code (C @@ -113,26 +59,11 @@ Wed Mar 23 09:51:45 UTC 2011 - fcrozat@novell.com - Improvements in project-manager - More features in git-plugin + Bugs fixed: - - bgo#638506 Homepage: FAQ Mailinglist link is wrong - - bgo#639786 quick bookmark deletion - - bgo#640277 editor position history doesn't work with - shortcut. - bgo#618142 Anjuta Snippets Plug-in - - bgo#627131 Autocompletion duplicates characters - - bgo#639795 Editing variabile after inserting snippet bug - - bgo#638980 Crash when closing project - - bgo#608578 Anjuta is unable to import Gnumeric source tree - - bgo#611206 doesn't recognize newer AC_INIT - - bgo#615990 path is missing when add a source to the target - - bgo#616041 Add Source -> Cannot add source files -> Core - Dump. - - bgo#618617 Project view doesn't make sense - - bgo#638368 test-suite fails - - bgo#639342 Anjuta crash when loading libgee - - bgo#640348 minor mistake in UI string - - bgo#640726 anjuta stops updating session information - - bgo#581613 Unable to import a tarball into Anjuta 2.4.2 - - bgo#639093 I can't start a new project properly + - bgo#638506, bgo#639786, bgo#640277, bgo#627131, bgo#639795, + bgo#638980, bgo#608578, bgo#611206, bgo#615990, bgo#616041, + bgo#618617, bgo#638368, bgo#639342, bgo#640348, bgo#640726, + bgo#581613, bgo#639093. - Changes from version 2.91.5: + Updates: - Glade integration is working again and far more stable @@ -142,66 +73,27 @@ Wed Mar 23 09:51:45 UTC 2011 - fcrozat@novell.com - Comment/Uncomment feature for C/C++ - Various improvements in vala support + Bugs fixed: - - bgo#638228 language-support-vala: interrupt parsing if user - switches to another file. - - bgo#638252 language-support-vala: use the new markers to show - error tooltips. - - bgo#511000 Icons needed - - bgo#638532 crash in plugin list when pressing cursor-down - bgo#637699 JavaScript wizard - - bgo#637774 Add Vala class wizard to class-gen - - bgo#638534 Criticals with local-only repositories - - bgo#616426 model wants symbols before db creation. - - bgo#625399 Attempt to make a query when database is not - connected. - - bgo#633018 crash in Anjuta IDE: I closed a project, wich... - - bgo#637695 allow comment/uncomment with gtksourceview editor - - bgo#638097 Remove deprecated gdk_spawn_command_line_on_screen - gdk_spawn_on_screen. - - bgo#638347 Incorrect makefile - - bgo#638830 Fortan typo? - - bgo#638878 $(BUILT_SOURCES): No such file or directory - - bgo#638034 Unable to create new project - - bgo#638524 Syntax error on valid configure.ac files + - bgo#638228, bgo#638252, bgo#511000, bgo#638532, bgo#637774, + bgo#638534, bgo#616426, bgo#625399, bgo#633018, bgo#637695, + bgo#638097, bgo#638347, bgo#638830, bgo#638878, bgo#638034, + bgo#638524. - Changes from version 2.91.4: + New: - Project Manager: Lots of work improving the new project manager. - Git Shell: More panes for git features - + Bugs fixed: - - bgo#636665: [PATCH] .vapi file not distributed - - bgo#609213: Anjuta FAQ - - bgo#636667: [PATCH] Plugins require GTK_LIBS to link against, - but this is not in configure.ac. - - bgo#637249: [class-gen] Python wizard - - bgo#621424: No easy way to delete a bookmark - - bgo#636312: Double click fails to select entire word if it - contains _ or digits. - - bgo#619592: crash in autocompletion - - bgo#636084: Crash Anjuta when typing in - Build->Configure->Configuration combo box. - - bgo#636666: [PATCH] Introspection fails to build with recent - gobject-introspection. - - bgo#636668: [PATCH] Link against the libraries anjuta and - anjuta-shell are using. - - bgo#584060: Project manager hangs anjuta when the contents of - project files changes. + + Bugs fixed: bgo#636665, bgo#609213, bgo#636667, bgo#637249, + bgo#621424, bgo#636312, bgo#619592, bgo#636084, bgo#636666, + bgo#636668, bgo#584060. - Changes from version 2.91.3: + New: - Git Shell: Git interface has changed to be context sensitive - Project Manager: New project manager landed with much better capabilities. - clang-analyzer: New plugin to use the clang analyzer - + Bugs fixed: - - bgo#615345 Tabs in AnjutaTabber should not expand to all - available space. - - bgo#631213 locale.h included twice in main.c - - bgo#633112 Smart Brace Completion Quotation Mark Crash - - bgo#633911 Unknown (translation) - - bgo#635121 language-support-cpp-java: fix invalid read of - paranthese-size setting. - - bgo#635795 Editing configure.ac crashes anjuta - - bgo#631521 create project in folder c++ + + Bugs fixed: bgo#615345, bgo#631213, bgo#633112, bgo#633911, + bgo#635121, bgo#635795, bgo#631521. - Changes from version 2.91.2: + New: - Everything works with gtk+-3.0 now. gconf replaced with @@ -209,21 +101,19 @@ Wed Mar 23 09:51:45 UTC 2011 - fcrozat@novell.com - Switch to enable/disable modeline detection - Automatic completion of comments with "*" + Bugs fixed: - - bgo#600407: Missing LIBXML_CFLAGS and LIBXML_LIBS - - bgo#627105: Mark default diff filenames for translation - - bgo#577595: Prepend comment with * - bgo#625903: Port to GSettings - - bgo#625978: configure failure in gtk+-3.0 environment - - bgo#631952: better GObject-Introspection support for - new-project branch - - bgo#633661: vala support is automagic -- Dropped BuildRequires: gconf2-devel, libunique-devel. + - bgo#600407, bgo#627105, bgo#577595, bgo#625978, bgo#631952, + bgo#633661. +- Dropped now unneeded BuildRequires: gconf2-devel, + libunique-devel. - Replace vte-devel BuildRequires with pkgconfig(vte-2.90) and pkgconfig(vala-0.10) with pkgconfig(libvala-0.12). -- Disabled glade3-catalog-anjuta subpackage (using if 0). -- Disabled translation-update-upstream. -- Remove hack to fixup permissions of documentation files. -- Replace gconf schema handling with gsettings schema handling. +- Disable glade3-catalog-anjuta subpackage with a + build_glade_catalog define, until we have a gtk3-powered glade. +- Remove hack to fixup permissions of documentation files in + %install. +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros. - Changed the explicit <= Obsoletes for the -doc package to <. ------------------------------------------------------------------- diff --git a/anjuta.spec b/anjuta.spec index 0e7c2c5..22ad70c 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define build_glade_catalog 0 Name: anjuta Version: 3.0.0.0 @@ -28,22 +28,15 @@ Source: anjuta-%{version}.tar.bz2 Source1: %{name}-rpmlintrc BuildRequires: autogen BuildRequires: binutils-devel -BuildRequires: devhelp-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gdl-devel BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme -BuildRequires: graphviz-devel -BuildRequires: gtksourceview-devel +BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libapr-util1-devel BuildRequires: libapr1-devel -BuildRequires: libgda-4_0-devel -BuildRequires: libgladeui-1_0-devel -BuildRequires: libneon-devel -BuildRequires: libwnck-devel BuildRequires: libxslt-devel BuildRequires: perl-gettext BuildRequires: shared-mime-info @@ -54,8 +47,22 @@ BuildRequires: update-desktop-files %ifnarch ia64 s390 s390x BuildRequires: valgrind-devel %endif -BuildRequires: pkgconfig(vte-2.90) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gdl-3.0) +%if %{build_glade_catalog} +BuildRequires: pkgconfig(gladeui-2.0) +%endif +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtksourceview-3.0) +BuildRequires: pkgconfig(libdevhelp-3.0) +BuildRequires: pkgconfig(libgda-4.0) +BuildRequires: pkgconfig(libgraph) +BuildRequires: pkgconfig(libgvc) BuildRequires: pkgconfig(libvala-0.12) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(neon) +BuildRequires: pkgconfig(vte-2.90) # Directly required by anjuta: Requires: autoconf Requires: autogen @@ -77,7 +84,7 @@ an integrated Valgrind memory profiler, an integrated gprof performance profiler, a class generator, a powerful source editor, source browsing, and more. -%if 0 +%if %{build_glade_catalog} %package -n glade3-catalog-anjuta License: GPLv2+ Summary: Versatile Integrated Development Environment for GNOME -- Catalog for Glade @@ -119,7 +126,7 @@ and more. %lang_package %prep %setup -q -#translation-update-upstream +translation-update-upstream %build %configure\ @@ -150,19 +157,19 @@ rm -rf %{buildroot} %post /sbin/ldconfig +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %icon_theme_cache_post gnome %mime_database_post -%glib2_gsettings_schema_post %postun /sbin/ldconfig +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %icon_theme_cache_postun gnome %mime_database_postun -%glib2_gsettings_schema_postun %files %defattr(-,root,root) @@ -178,13 +185,17 @@ rm -rf %{buildroot} %dir %{_datadir}/omf/ %dir %{_datadir}/omf/anjuta-manual/ %doc %{_datadir}/omf/anjuta-manual/anjuta-manual-C.omf -%{_bindir}/* -%{_libdir}/anjuta -%{_libdir}/*.so.* -%{_datadir}/anjuta +%{_bindir}/anjuta +%{_bindir}/anjuta-launcher +%{_bindir}/anjuta-tags +%{_libdir}/anjuta/ +%{_libdir}/libanjuta-3.so.* +%{_libdir}/girepository-1.0/Anjuta-3.0.typelib +%{_libdir}/girepository-1.0/IAnjuta-3.0.typelib +%{_datadir}/anjuta/ %{_datadir}/applications/*.desktop %{_datadir}/mime/packages/*.xml -%{_datadir}/pixmaps/anjuta +%{_datadir}/pixmaps/anjuta/ %{_datadir}/glib-2.0/schemas/*.gschema.xml # When removing the gnome icon theme icons, don't forget to remove the %%icon_theme_cache_post(un) call for them # Somehow I think that this is wrong: @@ -195,7 +206,7 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/*.svg %doc %{_mandir}/man?/*.* -%if 0 +%if %{build_glade_catalog} %files -n glade3-catalog-anjuta %defattr(-, root, root) %{_libdir}/glade3/modules/libgladeanjuta.so @@ -208,6 +219,7 @@ rm -rf %{buildroot} %{_includedir}/libanjuta-3.0/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{_datadir}/gir-1.0/*.gir %files lang -f %name.lang