rpms/anjuta/FC-5 anjuta-1.2.4a-search.patch, NONE, 1.1 anjuta-1.2.4a-watch-keys.patch, NONE, 1.1 anjuta-export-dynamic.patch, NONE, 1.1 anjuta.spec, 1.18, 1.19 anjuta-encodings.patch, 1.3, NONE project_type.patch, 1.1, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sun Aug 27 14:44:29 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654/FC-5
Modified Files:
anjuta.spec
Added Files:
anjuta-1.2.4a-search.patch anjuta-1.2.4a-watch-keys.patch
anjuta-export-dynamic.patch
Removed Files:
anjuta-encodings.patch project_type.patch
Log Message:
auto-import anjuta-1.2.4a-5 on branch FC-5 from anjuta-1.2.4a-5.src.rpm
anjuta-1.2.4a-search.patch:
--- NEW FILE anjuta-1.2.4a-search.patch ---
--- 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;
anjuta-1.2.4a-watch-keys.patch:
--- NEW FILE anjuta-1.2.4a-watch-keys.patch ---
--- 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;
}
anjuta-export-dynamic.patch:
--- NEW FILE anjuta-export-dynamic.patch ---
--- 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)
Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- anjuta.spec 6 Jul 2006 16:25:10 -0000 1.18
+++ anjuta.spec 27 Aug 2006 14:44:29 -0000 1.19
@@ -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 @@
%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 @@
%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 @@
%{_datadir}/omf/%{name}
%changelog
-* Wed Jul 05 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-4
-- Fix for gtkmm
-- altered to buildroot in spec file
-- fix ownership problem
+* Thu Aug 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 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 <paul at all-the-johnsons.co.uk> 1.2.4a-3
- added remove-static to configure line
--- anjuta-encodings.patch DELETED ---
--- project_type.patch DELETED ---
More information about the fedora-extras-commits
mailing list