Hello community, here is the log from the commit of package java-cup for openSUSE:Factory checked in at 2013-09-03 22:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-cup (Old) and /work/SRC/openSUSE:Factory/.java-cup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-cup" Changes: -------- --- /work/SRC/openSUSE:Factory/java-cup/java-cup-bootstrap.changes 2013-01-30 11:16:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-cup.new/java-cup-bootstrap.changes 2013-09-03 22:02:36.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 29 07:47:30 UTC 2013 - [email protected] + +- 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 - [email protected] + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- @@ -7 +19,7 @@ -Mon Nov 8 11:54:44 UTC 2010 - [email protected] +Mon Jun 4 13:08:48 UTC 2012 - [email protected] + +- license update: HPND + SPDX syntax + +------------------------------------------------------------------- +Mon Nov 8 11:55:22 UTC 2010 - [email protected] --- /work/SRC/openSUSE:Factory/java-cup/java-cup.changes 2012-10-18 21:50:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-cup.new/java-cup.changes 2013-09-03 22:02:36.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 29 07:47:30 UTC 2013 - [email protected] + +- 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 - [email protected] + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- +Fri Jan 25 15:36:53 UTC 2013 - [email protected] + +- sync licenses + +------------------------------------------------------------------- Old: ---- java-cup-javadoc.patch jpackage-bootstrap-prepare.sh New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-cup-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.v5oaFL/_old 2013-09-03 22:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.v5oaFL/_new 2013-09-03 22:02:37.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ 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 @@ %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 @@ %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -148,9 +123,6 @@ %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -160,12 +132,6 @@ (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 @@ %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog ++++++ java-cup.spec ++++++ --- /var/tmp/diff_new_pack.v5oaFL/_old 2013-09-03 22:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.v5oaFL/_new 2013-09-03 22:02:37.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ %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 @@ %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -145,9 +122,6 @@ %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -157,12 +131,6 @@ (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 @@ %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog ++++++ pre_checkin.sh ++++++ #!/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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
