diff --git a/java-cup-bootstrap.changes b/java-cup-bootstrap.changes index 2a7652a..67ea46b 100644 --- a/java-cup-bootstrap.changes +++ b/java-cup-bootstrap.changes @@ -1,10 +1,28 @@ ------------------------------------------------------------------- +Thu Aug 29 07:47:30 UTC 2013 - mvyskocil@suse.com + +- Add conflicts for each variant +- Sync .changes +- Drop weird jpackage-prepare script and use standard pre_checkin.sh + +------------------------------------------------------------------- +Fri Aug 23 08:06:54 UTC 2013 - mvyskocil@suse.com + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- Fri Jan 25 15:36:53 UTC 2013 - coolo@suse.com - sync licenses ------------------------------------------------------------------- -Mon Nov 8 11:54:44 UTC 2010 - mvyskocil@suse.cz +Mon Jun 4 13:08:48 UTC 2012 - cfarrell@suse.com + +- license update: HPND + SPDX syntax + +------------------------------------------------------------------- +Mon Nov 8 11:55:22 UTC 2010 - mvyskocil@suse.cz - Build ignore xml-comons-jax-1.3-apis diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec index 64f9e72..dcb53a6 100644 --- a/java-cup-bootstrap.spec +++ b/java-cup-bootstrap.spec @@ -16,20 +16,13 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} ##### WARNING: please do not edit this auto generated spec file. Use the java-cup.spec! ##### -%define with_bootstrap 1 +%global with_bootstrap 1 %bcond_with bootstrap -%define section free %define cvs_version 11a %define real_name java-cup Name: java-cup-bootstrap -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) Version: 0.11 Release: 0 Summary: LALR Parser Generator in Java @@ -42,8 +35,6 @@ Source1: java-cup.script Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license -Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -64,6 +55,13 @@ Provides: java_cup = %{version}-%{release} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bootstrap variant is just stripped down java-cup, so it conflicts +%if %without bootstrap +Conflicts: java-cup-bootstrap +%else +Conflicts: java-cup +%endif + %description java-cup is a LALR Parser Generator in Java. With v0.11, you can: * use CUP in an Ant-Target @@ -72,9 +70,7 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * myGrammar.cup * use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals + non terminals and terminals * have Your own symbol classes @@ -82,26 +78,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -126,7 +102,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -148,9 +123,6 @@ export CLASSPATH=$(build-classpath java-cup jflex) %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -160,12 +132,6 @@ export OPT_JAR_LIST=: (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -183,10 +149,6 @@ export OPT_JAR_LIST=: %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog diff --git a/java-cup-javadoc.patch b/java-cup-javadoc.patch deleted file mode 100644 index 16f143d..0000000 --- a/java-cup-javadoc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- develop/build.xml.orig 2006-09-09 06:16:46.000000000 +0200 -+++ develop/build.xml 2006-09-09 06:18:30.000000000 +0200 -@@ -74,6 +74,13 @@ - - - -+ - -+ -+ -+ -+ -+ -+ - - diff --git a/java-cup.changes b/java-cup.changes index 485606b..67ea46b 100644 --- a/java-cup.changes +++ b/java-cup.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Aug 29 07:47:30 UTC 2013 - mvyskocil@suse.com + +- Add conflicts for each variant +- Sync .changes +- Drop weird jpackage-prepare script and use standard pre_checkin.sh + +------------------------------------------------------------------- +Fri Aug 23 08:06:54 UTC 2013 - mvyskocil@suse.com + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- +Fri Jan 25 15:36:53 UTC 2013 - coolo@suse.com + +- sync licenses + ------------------------------------------------------------------- Mon Jun 4 13:08:48 UTC 2012 - cfarrell@suse.com diff --git a/java-cup.spec b/java-cup.spec index f7ecb4a..9a021c6 100644 --- a/java-cup.spec +++ b/java-cup.spec @@ -16,19 +16,12 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%define _without_bootstrap 1 +%global _without_bootstrap 1 %bcond_with bootstrap -%define section free %define cvs_version 11a %define real_name java-cup Name: java-cup -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) Version: 0.11 Release: 0 Summary: LALR Parser Generator in Java @@ -41,8 +34,6 @@ Source1: java-cup.script Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license -Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -63,6 +54,13 @@ Provides: java_cup = %{version}-%{release} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bootstrap variant is just stripped down java-cup, so it conflicts +%if %without bootstrap +Conflicts: java-cup-bootstrap +%else +Conflicts: java-cup +%endif + %description java-cup is a LALR Parser Generator in Java. With v0.11, you can: * use CUP in an Ant-Target @@ -79,26 +77,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -123,7 +101,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -145,9 +122,6 @@ export CLASSPATH=$(build-classpath java-cup jflex) %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -157,12 +131,6 @@ export OPT_JAR_LIST=: (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -180,10 +148,6 @@ export OPT_JAR_LIST=: %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog diff --git a/jpackage-bootstrap-prepare.sh b/jpackage-bootstrap-prepare.sh deleted file mode 100644 index 8bf1dcc..0000000 --- a/jpackage-bootstrap-prepare.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# This script is based on libcdio_spec-prepare.sh (thanks to sbrabec@suse.cz) -# create a -bootstrap spec for majority of Java packages for bootstrapping -# -#Usage: -# 1.) add these two lines below into the spec file including hash sign (#) -# behind the Name: tag -# # This line is not a comment, please do not remove it! -# #%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) -# 2.) you need to define a with_bootstrap macro with value 1 -# -# How it works: -# 1.) Was called by rpmbuild (or Re, or should be invoked manually from command line) -# 2.) Rename the package name to name-bootstrap -# 3.) Redefine the with_bootstrap macro to _without_bootstrap 1 -# 4.) Define a real_name macro with real name (used in %install and %files) -# 5.) Copy the .changes to -boostrap.changes - - -ORIG_SPEC=${2%-bootstrap} -# Never update -bootstrap file when it is already opened. It will break advanced build scripts: -if [[ "${2}" != "${ORIG_SPEC}" ]]; then - exit -fi - -if [[ ! -f ${1}/${ORIG_SPEC}.spec ]] ; then - exit -fi - -EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n" -sed "s/^%define _without_bootstrap.*$/${EDIT_WARNING}%define with_bootstrap 1/; - s/^\(Name:.*\)$/\1-bootstrap/; - " < ${1}/${ORIG_SPEC}.spec > ${1}/${ORIG_SPEC}-bootstrap.spec - -cp -a ${1}/${ORIG_SPEC}.changes ${1}/${ORIG_SPEC}-bootstrap.changes diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..852f9b9 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +NAME1=java-cup +NAME2=java-cup-bootstrap +COPY_CHANGES=true + +EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${NAME1}.spec! #####\n" +sed "s/^%global _without_bootstrap.*$/${EDIT_WARNING}%global with_bootstrap 1/; + s/^\(Name:.*\)$/\1-bootstrap/; + " < ${NAME1}.spec > ${NAME2:-${NAME1}-bootstrap}.spec + +if ${COPY_CHANGES}; then + cp ${NAME1}.changes ${NAME2:-${NAME1}-bootstrap}.changes +fi