packages: java-cup/java-cup.spec - do not force java-gcj-compat - fix jar n...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:42:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not force java-gcj-compat
- fix jar names

---- Files affected:
packages/java-cup:
   java-cup.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/java-cup/java-cup.spec
diff -u packages/java-cup/java-cup.spec:1.22 packages/java-cup/java-cup.spec:1.23
--- packages/java-cup/java-cup.spec:1.22	Tue Apr 21 16:14:14 2009
+++ packages/java-cup/java-cup.spec	Sun Apr 18 10:42:30 2010
@@ -3,30 +3,24 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 #
-%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
 #
-%define		ver		0.11a
+%define		_ver		11a
+%define		ver		0.%{_ver}
 %define		pkgver		%{ver}-20060912
 %define		srcname		cup
 Summary:	Java-based Constructor of Useful Parsers
 Summary(pl.UTF-8):	Javowy konstruktor przydatnych analizatorów
 Name:		java-cup
 Version:	%{ver}
-Release:	2
+Release:	3
 License:	BSD-like
 Group:		Development/Languages/Java
 Source0:	java_cup-%{pkgver}.tar.gz
 # Source0-md5:	c9b26e0e6c1c02f2b37148c54b28cd8d
 URL:		http://www2.cs.tum.edu/projects/cup/
 BuildRequires:	ant >= 1.5
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun <= 1.5}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
@@ -82,10 +76,10 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
-cp dist/java-cup-%{ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-cp dist/java-cup-%{ver}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime-%{version}.jar
-ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-ln -sf %{srcname}-runtime-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime.jar
+cp dist/java-cup-%{_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp dist/java-cup-%{_ver}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime-%{version}.jar
+ln -sf %{srcname}-%{_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+ln -sf %{srcname}-runtime-%{_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-runtime.jar
 
 # javadoc
 %if %{with javadoc}
@@ -116,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/04/18 08:42:30  jajcus
+- do not force java-gcj-compat
+- fix jar names
+
 Revision 1.22  2009/04/21 14:14:14  glen
 - sane build dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-cup/java-cup.spec?r1=1.22&r2=1.23&f=u