Author: pawelz Date: Fri Apr 23 00:04:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/paintown:
paintown.spec (1.23 -> 1.24)
packages/pluto:
pluto.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/paintown/paintown.spec
diff -u packages/paintown/paintown.spec:1.23
packages/paintown/paintown.spec:1.24
--- packages/paintown/paintown.spec:1.23 Wed Apr 21 19:05:34 2010
+++ packages/paintown/paintown.spec Fri Apr 23 02:04:13 2010
@@ -1,12 +1,6 @@
# $Revision$, $Date$
# TODO: optflags
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%include /usr/lib/rpm/macros.java
Summary: Paintown - an open source fighting game in the same genre as
Streets of Rage and Teenage Mutant Ninja Turtles
@@ -31,13 +25,11 @@
BuildRequires: cmake
BuildRequires: dumb-devel
BuildRequires: freetype-devel
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: python-devel
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: zlib-devel
@@ -121,6 +113,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2010/04/23 00:04:13 pawelz
+- Don't force specific jdk.
+
Revision 1.23 2010/04/21 17:05:34 arekm
- release 3
================================================================
Index: packages/pluto/pluto.spec
diff -u packages/pluto/pluto.spec:1.1 packages/pluto/pluto.spec:1.2
--- packages/pluto/pluto.spec:1.1 Sun Mar 15 02:32:34 2009
+++ packages/pluto/pluto.spec Fri Apr 23 02:04:17 2010
@@ -18,8 +18,7 @@
# Source0-md5: d6355e173ebda88b4a2da4f7df688875
URL: http://portals.apache.org/pluto/
BuildRequires: ant
-%{?with_java_sun:BuildRequires: java-sun}
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+BuildRequires: jdk
Requires: jpackage-utils
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,6 +91,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/04/23 00:04:17 pawelz
+- Don't force specific jdk.
+
Revision 1.1 2009/03/15 01:32:34 pawelz
- initial, NFY
- required by java-commons-fileupload
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paintown/paintown.spec?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pluto/pluto.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
