rpms/anjuta/devel anjuta-2.27.92.0-libxml.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 anjuta.spec, 1.83, 1.84 sources, 1.22, 1.23

Tom Callaway spot at fedoraproject.org
Sat Sep 12 14:32:59 UTC 2009


Author: spot

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15266

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-2.27.92.0-libxml.patch 
Log Message:
2.27.92, build fixes, rebuild for broken deps

anjuta-2.27.92.0-libxml.patch:
 document-manager/Makefile.am |    2 ++
 document-manager/Makefile.in |    2 ++
 gbf-am/Makefile.am           |    2 ++
 gbf-am/Makefile.in           |    2 ++
 gbf-mkfile/Makefile.am       |    2 ++
 gbf-mkfile/Makefile.in       |    2 ++
 language-manager/Makefile.am |    2 ++
 language-manager/Makefile.in |    2 ++
 macro/Makefile.am            |    2 ++
 macro/Makefile.in            |    2 ++
 10 files changed, 20 insertions(+)

--- NEW FILE anjuta-2.27.92.0-libxml.patch ---
diff -up anjuta-2.27.92.0/plugins/document-manager/Makefile.am.libxml anjuta-2.27.92.0/plugins/document-manager/Makefile.am
--- anjuta-2.27.92.0/plugins/document-manager/Makefile.am.libxml	2009-09-04 04:47:09.000000000 -0400
+++ anjuta-2.27.92.0/plugins/document-manager/Makefile.am	2009-09-12 09:55:19.496677705 -0400
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -31,6 +32,7 @@ libanjuta_document_manager_la_LDFLAGS = 
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES= \
diff -up anjuta-2.27.92.0/plugins/document-manager/Makefile.in.libxml anjuta-2.27.92.0/plugins/document-manager/Makefile.in
--- anjuta-2.27.92.0/plugins/document-manager/Makefile.in.libxml	2009-09-07 17:00:51.000000000 -0400
+++ anjuta-2.27.92.0/plugins/document-manager/Makefile.in	2009-09-12 09:55:19.498651979 -0400
@@ -391,6 +391,7 @@ AM_CPPFLAGS = \
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -398,6 +399,7 @@ libanjuta_document_manager_la_LDFLAGS = 
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES = \
diff -up anjuta-2.27.92.0/plugins/gbf-am/Makefile.am.libxml anjuta-2.27.92.0/plugins/gbf-am/Makefile.am
--- anjuta-2.27.92.0/plugins/gbf-am/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/gbf-am/Makefile.am	2009-09-12 09:55:19.498651979 -0400
@@ -25,6 +25,7 @@ AM_CPPFLAGS = 					\
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 	-DG_LOG_DOMAIN=\"libgbf-am\"
@@ -46,6 +47,7 @@ libgbf_am_la_LDFLAGS = $(ANJUTA_PLUGIN_L
 
 libgbf_am_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) \
   $(LIBXML_LIBS)
 
diff -up anjuta-2.27.92.0/plugins/gbf-am/Makefile.in.libxml anjuta-2.27.92.0/plugins/gbf-am/Makefile.in
--- anjuta-2.27.92.0/plugins/gbf-am/Makefile.in.libxml	2009-09-07 17:00:54.000000000 -0400
+++ anjuta-2.27.92.0/plugins/gbf-am/Makefile.in	2009-09-12 09:55:19.500651884 -0400
@@ -400,6 +400,7 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -419,6 +420,7 @@ libgbf_am_la_SOURCES = \
 libgbf_am_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libgbf_am_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) \
   $(LIBXML_LIBS)
 
diff -up anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am.libxml anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am
--- anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am.libxml	2009-09-12 09:58:15.600783689 -0400
+++ anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.am	2009-09-12 09:58:28.596783346 -0400
@@ -25,6 +25,7 @@ AM_CPPFLAGS = 					\
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -45,6 +46,7 @@ libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUG
 
 libgbf_mkfile_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 EXTRA_DIST = \
diff -up anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in.libxml anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in
--- anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in.libxml	2009-09-12 09:57:40.800782771 -0400
+++ anjuta-2.27.92.0/plugins/gbf-mkfile/Makefile.in	2009-09-12 09:58:06.395782832 -0400
@@ -389,6 +389,7 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DSCRIPTS_DIR=\"$(scriptsdir)\"
 
@@ -408,6 +409,7 @@ libgbf_mkfile_la_SOURCES = \
 libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libgbf_mkfile_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 EXTRA_DIST = \
diff -up anjuta-2.27.92.0/plugins/language-manager/Makefile.am.libxml anjuta-2.27.92.0/plugins/language-manager/Makefile.am
--- anjuta-2.27.92.0/plugins/language-manager/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/language-manager/Makefile.am	2009-09-12 09:55:19.500651884 -0400
@@ -24,6 +24,7 @@ language_manager_plugin_DATA = $(plugin_
 
 # Include paths
 AM_CPPFLAGS = \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) 
 
 # Where to install the plugin
@@ -37,6 +38,7 @@ liblanguage_manager_la_SOURCES = plugin.
 
 # Plugin dependencies
 liblanguage_manager_la_LIBADD = \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) 
 
 liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff -up anjuta-2.27.92.0/plugins/language-manager/Makefile.in.libxml anjuta-2.27.92.0/plugins/language-manager/Makefile.in
--- anjuta-2.27.92.0/plugins/language-manager/Makefile.in.libxml	2009-09-07 17:00:58.000000000 -0400
+++ anjuta-2.27.92.0/plugins/language-manager/Makefile.in	2009-09-12 09:55:19.501651453 -0400
@@ -348,6 +348,7 @@ language_manager_plugin_DATA = $(plugin_
 
 # Include paths
 AM_CPPFLAGS = \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) 
 
 
@@ -362,6 +363,7 @@ liblanguage_manager_la_SOURCES = plugin.
 
 # Plugin dependencies
 liblanguage_manager_la_LIBADD = \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS) 
 
 liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff -up anjuta-2.27.92.0/plugins/macro/Makefile.am.libxml anjuta-2.27.92.0/plugins/macro/Makefile.am
--- anjuta-2.27.92.0/plugins/macro/Makefile.am.libxml	2009-09-04 04:47:10.000000000 -0400
+++ anjuta-2.27.92.0/plugins/macro/Makefile.am	2009-09-12 09:55:19.502651860 -0400
@@ -21,6 +21,7 @@ macro_plugin_DATA = $(plugin_in_files:.p
 AM_CPPFLAGS= \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
 plugindir = $(anjuta_plugin_dir)
@@ -30,6 +31,7 @@ libanjuta_macro_la_LDFLAGS = $(ANJUTA_PL
 
 libanjuta_macro_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_macro_la_SOURCES = \
diff -up anjuta-2.27.92.0/plugins/macro/Makefile.in.libxml anjuta-2.27.92.0/plugins/macro/Makefile.in
--- anjuta-2.27.92.0/plugins/macro/Makefile.in.libxml	2009-09-07 17:00:59.000000000 -0400
+++ anjuta-2.27.92.0/plugins/macro/Makefile.in	2009-09-12 09:55:19.503651847 -0400
@@ -342,6 +342,7 @@ macro_plugin_DATA = $(plugin_in_files:.p
 AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
+	$(LIBXML_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
 plugindir = $(anjuta_plugin_dir)
@@ -349,6 +350,7 @@ plugin_LTLIBRARIES = libanjuta-macro.la
 libanjuta_macro_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libanjuta_macro_la_LIBADD = \
 	$(GIO_LIBS) \
+	$(LIBXML_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_macro_la_SOURCES = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	10 Aug 2009 11:23:26 -0000	1.22
+++ .cvsignore	12 Sep 2009 14:32:59 -0000	1.23
@@ -1 +1 @@
-anjuta-2.27.3.0.tar.bz2
+anjuta-2.27.92.0.tar.bz2


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- anjuta.spec	10 Aug 2009 11:23:26 -0000	1.83
+++ anjuta.spec	12 Sep 2009 14:32:59 -0000	1.84
@@ -1,20 +1,17 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.27.3.0
-Release:	3%{?dist}
+Version:	2.27.92.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.bz2
-
-# http://bugzilla.gnome.org/575147
-Patch0:		%{name}-%{version}-class-gen-templates.patch
-# http://bugzilla.gnome.org/588506
-Patch1:		%{name}-%{version}-docdir.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# Lots of places where libxml cflags/libs are not being used (but are needed)
+Patch0:		anjuta-2.27.92.0-libxml.patch
+
 Obsoletes:	gnome-build <= 2.24.1-1.fc10
 Provides:	perl(GBF::Make) = %{version}-%{release}
 
@@ -94,8 +91,8 @@ Documentation for Anjuta DevStudio provi
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+
+%patch0 -p1 -b .libxml
 
 # Filter unwanted Provides.
 cat << \EOF > %{name}-prov
@@ -272,11 +269,12 @@ scrollkeeper-update -q || :
 %doc ROADMAP
 %doc THANKS
 %doc %{_mandir}/man1/%{name}.1*
-%doc %{_mandir}/man1/%{name}_launcher.1*
+%doc %{_mandir}/man1/%{name}-launcher.1*
 %{_bindir}/%{name}
 %{_bindir}/gbf-am-parse
 %{_bindir}/gbf-mkfile-parse
-%{_bindir}/%{name}_launcher
+%{_bindir}/%{name}-launcher
+%{_bindir}/%{name}-tags
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/glade3/catalogs/anjuta-glade.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-%{name}.png
@@ -330,6 +328,10 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.27.92.0-1
+- bump to 2.27.92.0, rebuild for broken deps
+- fix compile (missing libxml cflags/libs)
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:2.27.3.0-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 Aug 2009 11:23:26 -0000	1.22
+++ sources	12 Sep 2009 14:32:59 -0000	1.23
@@ -1 +1 @@
-cd2c1e1cc6ad44d55c6fd6e76a6fd5f9  anjuta-2.27.3.0.tar.bz2
+302691ed64826292fea61dac31212d1d  anjuta-2.27.92.0.tar.bz2




More information about the fedora-extras-commits mailing list