diff --git a/anjuta-1.2.4a-search.patch b/anjuta-1.2.4a-search.patch new file mode 100644 index 0000000..7bf7bea --- /dev/null +++ b/anjuta-1.2.4a-search.patch @@ -0,0 +1,18 @@ +--- anjuta-1.2.4a/src/search-replace.c.old 2005-04-24 16:18:46.000000000 +0200 ++++ anjuta-1.2.4a/src/search-replace.c 2006-08-02 08:32:47.000000000 +0200 +@@ -1607,7 +1645,15 @@ + search_set_action (SA_FIND_PANE); + search_set_direction (SD_FORWARD); + } ++ } else { ++ search_set_target(SR_BUFFER); ++ if (!replace) ++ { ++ search_set_action (SA_SELECT); ++ search_set_direction (SD_FORWARD); ++ } + } ++ + show_jump_button(FALSE); + + notebook = sr_get_gladewidget(SEARCH_NOTEBOOK)->widget; diff --git a/anjuta-1.2.4a-watch-keys.patch b/anjuta-1.2.4a-watch-keys.patch new file mode 100644 index 0000000..b02de39 --- /dev/null +++ b/anjuta-1.2.4a-watch-keys.patch @@ -0,0 +1,11 @@ +--- anjuta-1.2.4a/src/watch_gui.c.old 2004-04-06 16:40:46.000000000 +0200 ++++ anjuta-1.2.4a/src/watch_gui.c 2006-07-31 13:27:13.000000000 +0200 +@@ -95,7 +95,7 @@ + watch_menu = gtk_menu_new (); + + gnome_app_fill_menu (GTK_MENU_SHELL (watch_menu), watch_menu_uiinfo, +- NULL, FALSE, 0); ++ app->accel_group, TRUE, 0); + + return watch_menu; + } diff --git a/anjuta-encodings.patch b/anjuta-encodings.patch deleted file mode 100644 index c189f10..0000000 --- a/anjuta-encodings.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- anjuta-1.2.4a/src/anjuta-encodings.c 2005-12-15 18:50:55.000000000 +0100 -+++ anjuta-1.2.4a/src/anjuta-encodings.c 2005-12-15 18:51:38.000000000 +0100 -@@ -707,15 +707,15 @@ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (stock_treeview)); - g_return_if_fail (selection != NULL); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); -- g_signal_connect (G_OBJECT (selection), "changed", -- G_CALLBACK (on_stock_selection_changed), NULL); - - model = create_encodings_treeview_model (); - gtk_tree_view_set_model (GTK_TREE_VIEW (stock_treeview), model); -+ g_signal_connect (G_OBJECT (selection), "changed", -+ G_CALLBACK (on_stock_selection_changed), NULL); - g_object_unref (model); - - /* Add the encoding column for supported treeview*/ - cell = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Supported Encodings"), -@@ -726,17 +726,17 @@ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (supported_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (supported_treeview)); - g_return_if_fail (selection != NULL); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); -- g_signal_connect (G_OBJECT (selection), "changed", -- G_CALLBACK (on_supported_selection_changed), NULL); - - /* create list store */ - model = GTK_TREE_MODEL (gtk_list_store_new (SUPPORTED_ENCODING_NUM_COLS, - G_TYPE_STRING, G_TYPE_POINTER)); - gtk_tree_view_set_model (GTK_TREE_VIEW (supported_treeview), model); -+ g_signal_connect (G_OBJECT (selection), "changed", -+ G_CALLBACK (on_supported_selection_changed), NULL); - g_object_unref (model); - - anjuta_preferences_register_property_custom (pref, supported_treeview, - SUPPORTED_ENCODINGS, - ---- anjuta-1.2.4a/src/Makefile.in 2005-08-12 16:37:02.000000000 +0200 -+++ anjuta-1.2.4a/src/Makefile.in 2006-03-24 19:16:54.000000000 +0100 -@@ -723,7 +723,7 @@ - done - anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) - @rm -f anjuta$(EXEEXT) -- $(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) -+ $(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) - "ISO-8859-15", diff --git a/anjuta-export-dynamic.patch b/anjuta-export-dynamic.patch new file mode 100644 index 0000000..93298f3 --- /dev/null +++ b/anjuta-export-dynamic.patch @@ -0,0 +1,11 @@ +--- anjuta-1.2.4a/src/Makefile.in 2005-08-12 16:37:02.000000000 +0200 ++++ anjuta-1.2.4a/src/Makefile.in 2006-03-24 19:16:54.000000000 +0100 +@@ -723,7 +723,7 @@ + done + anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) + @rm -f anjuta$(EXEEXT) +- $(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) ++ $(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/anjuta.spec b/anjuta.spec index a820b0d..3573281 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,27 +1,21 @@ Name: anjuta Version: 1.2.4a -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: anjuta-encodings.patch -Patch1: project_type.patch -BuildRequires: libgnomeui-devel >= 2.0.2 -BuildRequires: libbonoboui-devel >= 2.0.1 -BuildRequires: libgnomeprintui22-devel -BuildRequires: ncurses-devel >= 5.0 -BuildRequires: pcre-devel >= 3.9 -BuildRequires: popt -BuildRequires: vte-devel -BuildRequires: scrollkeeper -BuildRequires: libtool -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: libgnome-devel -BuildRequires: gtk2-devel +#Patch0: anjuta-encodings.patch +Patch1: anjuta-1.2.4a-search.patch +Patch2: anjuta-1.2.4a-watch-keys.patch +Patch3: anjuta-export-dynamic.patch +BuildRequires: libgnomeui-devel >= 2.0.2 libbonoboui-devel >= 2.0.1 +BuildRequires: libgnomeprintui22-devel ncurses-devel >= 5.0 +BuildRequires: pcre-devel >= 3.9 popt vte-devel scrollkeeper +BuildRequires: libtool gettext-devel desktop-file-utils libgnome-devel +BuildRequires: gtk2-devel ldconfig perl(XML::Parser) Epoch: 1 Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper @@ -48,16 +42,18 @@ Anjuta documentation. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build # configure option --enable-final does not work corretly on x86_64; Use # -DNDEBUG in CFLAGS -#export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure --disable-static -%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') -sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status +#%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') +#sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status make %install @@ -87,25 +83,33 @@ popd %clean rm -rf %{buildroot} +%post +/sbin/ldconfig +update-mime-database %{_datadir}/mime &> /dev/null || : + +%postun +/sbin/ldconfig +update-mime-database %{_datadir}/mime &> /dev/null || : + %post docs -scrollkeeper-update -q +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun docs -scrollkeeper-update -q +scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO %doc doc/ScintillaDoc.html %{_bindir}/%{name}* -%{_libdir}/%{name}* +%{_libdir}/%{name}/ %{_datadir}/%{name} -%{_datadir}/doc/anjuta +%{_datadir}/doc/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name} -%{_datadir}/mime-info/anjuta.mime %{_datadir}/mimelnk/application/x-anjuta-project.desktop -%{_datadir}/man/man1/anjuta* +%{_datadir}/mime-info/%{name}.mime +%{_mandir}/man1/* %files docs %defattr(-,root,root,-) @@ -113,10 +117,11 @@ scrollkeeper-update -q %{_datadir}/omf/%{name} %changelog -* Wed Jul 05 2006 Paul F. Johnson 1.2.4a-4 -- Fix for gtkmm -- altered to buildroot in spec file -- fix ownership problem +* Thu Aug 24 2006 Paul F. Johnson 1.2.4a-5 +- Corrected mime-info +- Added hotkey and search fixes (Martin Stransky) +- Multiple spec file fixes +- removal of RPM_BUILD_ROOT to buildroot * Wed Jun 21 2006 Paul F. Johnson 1.2.4a-3 - added remove-static to configure line diff --git a/project_type.patch b/project_type.patch deleted file mode 100644 index ee91e0a..0000000 --- a/project_type.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- anjuta-1.2.4a/src/project_type.c 2005-04-06 10:05:45.000000000 +0100 -+++ anjuta-1.2.4a/src/project_type.c 2006-07-06 12:53:21.000000000 +0100 -@@ -96,7 +96,7 @@ - "\\\n\t$(PACKAGE_CFLAGS)", - "\\\n\t$(PACKAGE_LIBS)", - -- "PKG_CHECK_MODULES(PACKAGE, [gtkmm-2.0])\n" -+ "PKG_CHECK_MODULES(PACKAGE, [gtkmm-2.4])\n" - "AC_SUBST(PACKAGE_CFLAGS)\n" - "AC_SUBST(PACKAGE_LIBS)", -