[anjuta/f14/master] - Fixed configure to look for vala-0.10.pc and not vala-1.0.pc. - Restored 'BuildRequires: graphviz-

Debarshi Ray rishi at fedoraproject.org
Sun Aug 22 10:17:27 UTC 2010 

commit cd4a35a8f455196fec35cad1cfea6eb067229fa7
Author: Debarshi Ray <rishi at freebook.(none)>
Date:   Sun Aug 22 13:17:21 2010 +0300

    - Fixed configure to look for vala-0.10.pc and not vala-1.0.pc.
    - Restored 'BuildRequires: graphviz-devel' as the class inheritence plugin
      was copied over from anjuta-extras.
    - Added 'BuildRequires: sqlite-devel' for the symbol-db benchmarks.

 anjuta-2.31.6.1-vala.patch |   47 ++++++++++++++++++++++++++++++++++++++++++++
 anjuta.spec                |   24 ++++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)
---
diff --git a/anjuta-2.31.6.1-vala.patch b/anjuta-2.31.6.1-vala.patch
new file mode 100644
index 0000000..0a63514
--- /dev/null
+++ b/anjuta-2.31.6.1-vala.patch
@@ -0,0 +1,47 @@
+diff -urNp anjuta-2.31.6.1.orig/configure anjuta-2.31.6.1/configure
+--- anjuta-2.31.6.1.orig/configure	2010-08-22 12:06:53.442559313 +0300
++++ anjuta-2.31.6.1/configure	2010-08-22 12:08:12.373809668 +0300
+@@ -16142,12 +16142,12 @@ if test -n "$VALA_CFLAGS"; then
+     pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQUIRED") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-0.10 >= \$VALA_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "vala-0.10 >= $VALA_REQUIRED") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 >= $VALA_REQUIRED" 2>/dev/null`
++  pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-0.10 >= $VALA_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -16158,12 +16158,12 @@ if test -n "$VALA_LIBS"; then
+     pkg_cv_VALA_LIBS="$VALA_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQUIRED") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-0.10 >= \$VALA_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "vala-0.10 >= $VALA_REQUIRED") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 >= $VALA_REQUIRED" 2>/dev/null`
++  pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-0.10 >= $VALA_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -16183,9 +16183,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-1.0 >= $VALA_REQUIRED" 2>&1`
++	        VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-0.10 >= $VALA_REQUIRED" 2>&1`
+         else
+-	        VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-1.0 >= $VALA_REQUIRED" 2>&1`
++	        VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-0.10 >= $VALA_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$VALA_PKG_ERRORS" >&5
diff --git a/anjuta.spec b/anjuta.spec
index a3a6e8e..05943d1 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -5,11 +5,14 @@ Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
 Version:	2.31.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://download.gnome.org/sources/anjuta/2.30/%{name}-%{version}.tar.bz2
+
+Patch0:		%{name}-%{version}-vala.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Obsoletes:	gnome-build <= 2.24.1-1.fc10
@@ -39,6 +42,7 @@ BuildRequires:	devhelp-devel >= 0.22
 BuildRequires:	gettext
 BuildRequires:	glade3-libgladeui-devel >= 3.6.0
 BuildRequires:	gnome-doc-utils
+BuildRequires:	graphviz-devel
 BuildRequires:	gtksourceview2-devel >= 2.9.7
 BuildRequires:	intltool
 BuildRequires:	libgda-devel >= 4.0.0
@@ -48,6 +52,7 @@ BuildRequires:	neon-devel
 BuildRequires:	perl(Locale::gettext)
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
+BuildRequires:	sqlite-devel
 BuildRequires:	subversion-devel
 BuildRequires:	unique-devel >= 1.0.0
 BuildRequires:	vala-devel >= 0.7.8
@@ -87,6 +92,7 @@ Documentation for Anjuta DevStudio provided in DocBook format.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{__isa_bits} == 64
   sed --in-place 's/\/usr\/lib\/pkgconfig/\/usr\/lib64\/pkgconfig/g' \
@@ -139,7 +145,7 @@ sed --expression 's|-R/usr/lib64||' %{_libdir}/pkgconfig/pangox.pc > \
 %build
 export PKG_CONFIG_PATH="./PKGCONFIG"
 %configure --disable-schemas-install --disable-silent-rules --disable-static \
-  --enable-gtk-doc --enable-introspection=yes --enable-plugin-devhelp \
+  --enable-gtk-doc --enable-introspection=no --enable-plugin-devhelp \
   --enable-plugin-glade --enable-plugin-sourceview --enable-plugin-subversion \
   --enable-scrollkeeper \
   --docdir=%{_docdir}/%{name}-%{version} \
@@ -281,14 +287,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/%{name}-tags
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/glade3/catalogs/anjuta-glade.xml
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-x-%{name}.png
+%{_datadir}/icons/gnome/24x24/mimetypes/gnome-mime-application-x-%{name}.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-x-%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-%{name}.png
 %{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-x-%{name}.svg
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
 # No soname.
 %{_libdir}/glade3/modules/libgladeanjuta.so
 %{_libdir}/libanjuta.so.*
+%{_libdir}/libanjuta-foocanvas.so.*
 # Symlink to libanjuta.so.*.
 %{_libdir}/libglade/2.0/libanjuta.so
 %{_sysconfdir}/gconf/schemas/file-manager.schemas
@@ -316,6 +329,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr (-,root,root,-)
 %doc doc/ScintillaDoc.html
 %{_libdir}/libanjuta.so
+%{_libdir}/libanjuta-foocanvas.so
 %{_libdir}/pkgconfig/libanjuta-1.0.pc
 
 %dir %{_datadir}/gtk-doc/html/libanjuta
@@ -340,6 +354,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sun Aug 22 2010 Debarshi Ray <rishi at fedoraproject.org> - 1:2.31.6.1-2
+- Fixed configure to look for vala-0.10.pc and not vala-1.0.pc.
+- Restored 'BuildRequires: graphviz-devel' as the class inheritence plugin
+  was copied over from anjuta-extras.
+- Added 'BuildRequires: sqlite-devel' for the symbol-db benchmarks.
+
 * Fri Aug 06 2010 Debarshi Ray <rishi at fedoraproject.org> - 1:2.31.6.1-1
 - Version bump to 2.31.6.1.
   * Debugger is now much more polished.

More information about the scm-commits mailing list