rpms/anjuta/FC-4 anjuta-encodings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 anjuta.spec, 1.10, 1.11 sources, 1.4, 1.5

Paul F. Johnson (pfj) fedora-extras-commits at redhat.com
Sun Apr 2 23:38:48 UTC 2006


Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11149/FC-4

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-encodings.patch 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-4 from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

--- NEW FILE anjuta-encodings.patch ---
--- src/anjuta-encodings.c	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,

--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
+++ 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",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 14:07:32 -0000	1.4
+++ .cvsignore	2 Apr 2006 23:38:48 -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/FC-4/anjuta.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- anjuta.spec	7 Jul 2005 14:07:32 -0000	1.10
+++ anjuta.spec	2 Apr 2006 23:38:48 -0000	1.11
@@ -1,7 +1,6 @@
 Name:           anjuta
-Version:        1.2.3
-Release:        1%{?dist}
-Epoch:          1
+Version:        1.2.4
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -9,18 +8,21 @@
 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
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
+Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
@@ -44,24 +46,19 @@
 %description docs
 Anjuta documentation.
 
-
-
 %prep
 %setup -q
-
-
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %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
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -83,24 +80,20 @@
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
 ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
-
+pushd ${RPM_BUILD_ROOT}%{_docdir}
+ln -s anjuta-1.2.4 anjuta
+popd
 
 
 %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
@@ -108,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -119,10 +113,30 @@
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/omf/%{name}
 
+%changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
+* Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
+- Added back in the epoch - oopsie!
+
+* 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
 
+* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-3
+- rebuilt
 
-%changelog
-* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-1
+* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-2
 - Update to 1.2.3.
 - Add gettext-devel dependency (Paul Frields).
 - Add libtool (+automake, +autoconf) dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 14:07:33 -0000	1.4
+++ sources	2 Apr 2006 23:38:48 -0000	1.5
@@ -1 +1 @@
-a2fc3873519f566607cf268276db3b90  anjuta-1.2.3.tar.gz
+5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz




More information about the fedora-extras-commits mailing list