packages: paintown/paintown.spec - unify java package (BRs, R: jre-X11, not...

[pawelz]

Author: pawelz                       Date: Sun Jan 17 21:17:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify java package (BRs, R: jre-X11, not java-sun-jre-X11)

---- Files affected:
packages/paintown:
   paintown.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/paintown/paintown.spec
diff -u packages/paintown/paintown.spec:1.17 packages/paintown/paintown.spec:1.18
--- packages/paintown/paintown.spec:1.17	Sat Jan 16 16:21:07 2010
+++ packages/paintown/paintown.spec	Sun Jan 17 22:17:47 2010
@@ -1,5 +1,14 @@
 # $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
 Summary(hu.UTF-8):	Paintown - egy nyílt forrású verekedős játék a Streets of Rage és a Teenage Mutant Ninja Turtles nyomdokain
 Summary(pl.UTF-8):	Paintown - gra zręcznościowa podobna do Streets of Rage lub Teenage Mutants inja Turtles
@@ -22,11 +31,18 @@
 BuildRequires:	cmake
 BuildRequires:	dumb-devel
 BuildRequires:	freetype-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
+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
 Requires:	allegro-alsa
+Requires:	jpackage-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,7 +60,7 @@
 %package editor
 Summary:	Paintown editor
 Group:		X11/Applications/Games
-Requires:	java-sun-jre-X11
+Requires:	jre-X11
 
 %description editor
 Paintown editor.
@@ -107,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/01/17 21:17:47  pawelz
+- unify java package (BRs, R: jre-X11, not java-sun-jre-X11)
+
 Revision 1.17  2010/01/16 15:21:07  uzsolt
 - remove editor-specific TODO (does not work on awesome wm)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/paintown/paintown.spec?r1=1.17&r2=1.18&f=u