rpms/java_cup/devel java_cup.spec,1.28,1.29

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/java_cup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28611

Modified Files:
	java_cup.spec 
Log Message:
- Rebuilt in non-bootstrap mode (removed all prebuilt jars).
- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode
- Remove unnecessary R(post,postun): coreutils




Index: java_cup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- java_cup.spec	8 Jan 2010 11:55:22 -0000	1.28
+++ java_cup.spec	17 Jan 2010 19:08:06 -0000	1.29
@@ -30,10 +30,11 @@
 
 %define pkg_version     11a
 %define section         free
+%define with_bootstrap  0
 
 Name:           java_cup
 Version:        0.11a
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Java source interpreter
 License:        BSD and LGPLv2
@@ -44,6 +45,10 @@ Source0:        java_cup-0.11a.tar.bz2
 Patch0:         %{name}-build.patch
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:	jflex
+%if ! %{with_bootstrap}
+BuildRequires:	java_cup >= 1:0.11a
+%endif
 Group:          Development/Tools
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,9 +59,6 @@ java_cup is a LALR Parser Generator for 
 %package javadoc
 Summary:        Javadoc for java_cup
 Group:          Documentation
-# For /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
 
 %description javadoc
 Javadoc for java_cup
@@ -75,7 +77,21 @@ Documentation for java_cup.
 # remove all binary files
 find . -name "*.class" -exec rm -f {} \;
 
+# remove prebuilt JFlex
+rm -rf java_cup-0.11a/bin/JFlex.jar
+
+# remove prebuilt java_cup, if not bootstrapping
+%if ! %{with_bootstrap}
+rm -rf java_cup-0.11a/bin/java-cup-11.jar
+%endif
+
 %build
+%if ! %{with_bootstrap}
+export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
+%else
+export CLASSPATH=$(build-classpath jflex)
+%endif
+
 ant
 find . -name parser.cup -exec rm {} \;
 ant javadoc
@@ -113,6 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jan 17 2010 Miloš Jakubíček <xjakub at fi.muni.cz> - 1:0.11a-2
+- Rebuilt in non-bootstrap mode (removed all prebuilt jars).
+- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode
+- Remove unnecessary R(post,postun): coreutils
+
 * Fri Jan 8 2010 Alexander Kurtakov <akurtako at redhat.com> 1:0.11a-1
 - Update to 0.11a.
 - Drop gcj_support.