rpms/anjuta/devel anjuta-encodings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 anjuta.spec, 1.13, 1.14 sources, 1.4, 1.5
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Mon Feb 20 23:24:25 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4257/devel
Modified Files:
.cvsignore anjuta.spec sources
Added Files:
anjuta-encodings.patch
Log Message:
auto-import anjuta-1.2.4-2 on branch devel from anjuta-1.2.4-2.src.rpm
anjuta-encodings.patch:
--- NEW FILE anjuta-encodings.patch ---
--- src/anjuta-encodings.c.orig 2005-12-15 18:50:55.000000000 +0100
+++ 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,
"ISO-8859-15",
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 7 Jul 2005 10:28:28 -0000 1.4
+++ .cvsignore 20 Feb 2006 23:24:25 -0000 1.5
@@ -1 +1 @@
-anjuta-1.2.3.tar.gz
+anjuta-1.2.4.tar.gz
Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anjuta.spec 18 Aug 2005 20:07:20 -0000 1.13
+++ anjuta.spec 20 Feb 2006 23:24:25 -0000 1.14
@@ -1,7 +1,6 @@
Name: anjuta
-Version: 1.2.3
-Release: 3%{?dist}
-Epoch: 1
+Version: 1.2.4
+Release: 2%{?dist}
Summary: GNOME IDE for C and C++
Group: Development/Tools
@@ -9,12 +8,13 @@
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
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
@@ -39,17 +39,14 @@
%package docs
Summary: Anjuta documentation
Group: Development/Tools
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description docs
Anjuta documentation.
-
-
%prep
%setup -q
-
-
+%patch -p0 -b patch0
%build
# configure option --enable-final does not work corretly on x86_64; Use
@@ -84,23 +81,15 @@
s!tm_global_tags!%{name}_tm_global_tags!g;
' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
-
-
%clean
rm -rf ${RPM_BUILD_ROOT}
-
-
%post docs
scrollkeeper-update -q
-
-
%postun docs
scrollkeeper-update -q
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
@@ -119,9 +108,14 @@
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}
+%changelog
+* Mon Feb 20 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-2
+- Added patch from Anjuta-bugzilla
+* Sat Feb 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-1
+- bumped to 1.2.4
+- change of maintainer
-%changelog
* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-3
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 7 Jul 2005 10:28:28 -0000 1.4
+++ sources 20 Feb 2006 23:24:25 -0000 1.5
@@ -1 +1 @@
-a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz
+5a709fbaedc816a88fd8b9ad5276a47b anjuta-1.2.4.tar.gz
More information about the scm-commits
mailing list