Author: arekm Date: Sun Nov 18 17:49:24 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel .2; disable java modules on not supported architectures; clean build so
configure and make is separated
---- Files affected:
SPECS:
mysql-gui-tools.spec (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/mysql-gui-tools.spec
diff -u SPECS/mysql-gui-tools.spec:1.20 SPECS/mysql-gui-tools.spec:1.21
--- SPECS/mysql-gui-tools.spec:1.20 Sun Nov 18 14:31:51 2007
+++ SPECS/mysql-gui-tools.spec Sun Nov 18 18:49:19 2007
@@ -11,7 +11,7 @@
Summary(pl.UTF-8): Narzędzia GUI dla MySQL-a 5.0 - pliki wspólne
Name: mysql-gui-tools
Version: 5.0
-Release: 0.%{_rel}.1
+Release: 0.%{_rel}.2
License: GPL
Group: Applications/Databases
#Source0:
http://sunsite.icm.edu.pl/mysql/Downloads/MySQLGUITools/%{name}-%{version}%{_rel}.tar.gz
@@ -30,6 +30,9 @@
BuildRequires: gettext-devel
BuildRequires: gtkhtml-devel >= 3.14.0
BuildRequires: gtkmm-devel >= 2.4.0
+%ifarch i586 i686 pentium3 pentium4 athlon %{x8664}
+BuildRequires: jdk
+%endif
BuildRequires: libglade2-devel >= 1:2.0.0
BuildRequires: libgtkhtml-devel
BuildRequires: libuuid-devel
@@ -154,6 +157,9 @@
%{__autoheader}
%{__automake}
%configure \
+%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
+ --disable-java-modules \
+%endif
--with-gtkhtml=libgtkhtml-%{_gtkhtml_ver} \
--enable-canvas \
--enable-grt \
@@ -168,7 +174,6 @@
%{__autoconf}
%{__automake}
%configure
-%{__make}
cd ..
# Query Browser
@@ -179,7 +184,6 @@
%{__automake}
%configure \
--with-gtkhtml=libgtkhtml-%{_gtkhtml_ver}
-%{__make}
cd ..
# Workbench
@@ -191,7 +195,12 @@
%configure \
--with-gtkhtml=libgtkhtml-%{_gtkhtml_ver} \
--with-commondirname=common
-%{__make}
+cd ..
+
+%{__make} -C mysql-gui-common
+%{__make} -C mysql-administrator
+%{__make} -C mysql-query-browser
+%{__make} -C mysql-workbench
%install
rm -rf $RPM_BUILD_ROOT
@@ -266,6 +275,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2007-11-18 17:49:19 arekm
+- rel .2; disable java modules on not supported architectures; clean build so
configure and make is separated
+
Revision 1.20 2007-11-18 13:31:51 arekm
- rel .1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mysql-gui-tools.spec?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
