SPECS: mysql-query-browser.spec - build fixes for my builder

[glen]

Author: glen                         Date: Wed Feb 15 20:04:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build fixes for my builder

---- Files affected:
SPECS:
   mysql-query-browser.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/mysql-query-browser.spec
diff -u SPECS/mysql-query-browser.spec:1.12 SPECS/mysql-query-browser.spec:1.13
--- SPECS/mysql-query-browser.spec:1.12	Wed Feb 15 17:29:10 2006
+++ SPECS/mysql-query-browser.spec	Wed Feb 15 21:04:24 2006
@@ -1,26 +1,33 @@
 # $Revision$, $Date$
 # TODO
 # - %{_datadir}/mysql-gui directory owned also my mysql-administrator.
-# create separate package mysql-gui?
+# create separate package mysql-gui-common?
+# - perl-XML-Parser dep maybe bogus, lazy to check now:
+#   configure:	error: XML::Parser perl module is required for intltool
+#   make[4]:Entering directory
+#   `/home/builder/rpm/pld/BUILD/mysql-query-browser-1.1.18/mysql-query-browser/source/linux/gtksourceview'
+#   make[4]:*** No targets specified and no makefile found.  Stop.
 Summary:	A graphical MySQL query shell
 Summary(pl):	Graficzna powłoka do zapytań MySQL-a
 Name:		mysql-query-browser
 Version:	1.1.18
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Databases
 Source0:	http://mysql.tonnikala.org/Downloads/MySQLAdministrationSuite/%{name}-%{version}.tar.gz
 # Source0-md5:	bf9cae997cc6ac833e68dafff580c315
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-configure.patch
 URL:		http://www.mysql.com/products/query-browser/
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	gtkhtml-devel >= 3.6.0
 BuildRequires:	gtkmm-devel >= 2.4.0
-BuildRequires:	libglade2-devel >= 2.0.0
+BuildRequires:	libglade2-devel >= 1:2.0.0
 BuildRequires:	libgtkhtml-devel
 BuildRequires:	mysql-devel
 BuildRequires:	pcre-devel >= 3.9
+BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,11 +50,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+export PKG_CONFIG=pkg-config
 # first we have to build the common libs
 cd mysql-gui-common
 install /usr/share/automake/config.* .
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--with-gtkhtml=libgtkhtml-3.8 \
 	--with-commondirname=query-browser
@@ -56,6 +69,10 @@
 # then the app itself
 cd ../%{name}
 install /usr/share/automake/config.* .
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--with-gtkhtml=libgtkhtml-3.8 \
 	--with-commondirname=query-browser
@@ -102,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/02/15 20:04:24  glen
+- build fixes for my builder
+
 Revision 1.12  2006/02/15 16:29:10  arekm
 - updated to 1.1.18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql-query-browser.spec?r1=1.12&r2=1.13&f=u