Hello community, here is the log from the commit of package javacc for openSUSE:Leap:15.2 checked in at 2020-02-05 07:24:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/javacc (Old) and /work/SRC/openSUSE:Leap:15.2/.javacc.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javacc" Wed Feb 5 07:24:43 2020 rev:12 rq:762847 version:7.0.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/javacc/javacc.changes 2020-01-15 15:13:15.682169242 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.javacc.new.26092/javacc.changes 2020-02-05 07:24:45.326628871 +0100 @@ -1,0 +2,19 @@ +Tue Apr 9 14:37:13 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Make this a multibuild package where the bootstrap version is + built using the included javacc.jar and the non-bootstrap version + uses the system javacc.jar + +------------------------------------------------------------------- +Wed Feb 6 09:12:23 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Upgrade to 7.0.4 + * No obvious changelog + * Fixes a number of C++ generation issues +- Generate the scripts during build using jpackage_script +- Build and package the javadoc documentation +- Removed patch: + * javacc.patch + + not needed any more in this version + +------------------------------------------------------------------- Old: ---- javacc javacc-5.0src.tar.gz javacc.patch jjdoc jjtree New: ---- 7.0.4.tar.gz _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.WQTR8d/_old 2020-02-05 07:24:45.898629112 +0100 +++ /var/tmp/diff_new_pack.WQTR8d/_new 2020-02-05 07:24:45.902629114 +0100 @@ -1,7 +1,8 @@ # # spec file for package javacc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,28 +13,41 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: javacc -Version: 5.0 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "bootstrap" +%bcond_without bootstrap +%else +%bcond_with bootstrap +%endif +%global base_name javacc +Version: 7.0.4 Release: 0 Summary: A Parser and Scanner Generator for Java License: BSD-3-Clause Group: Development/Libraries/Java -Url: http://javacc.java.net/ -Source0: http://java.net/projects/%{name}/downloads/download/%{name}-%{version}src.tar.gz -Source1: javacc -Source2: jjdoc -Source3: jjtree -Patch0: javacc.patch +URL: http://javacc.org +Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz BuildRequires: ant +BuildArch: noarch +%if %{with bootstrap} +Name: %{base_name}-bootstrap +BuildRequires: javapackages-tools +Provides: %{base_name} +%else +Name: %{base_name} +BuildRequires: %{base_name} BuildRequires: fdupes -BuildRequires: java-devel -BuildRequires: xml-commons-apis +BuildRequires: javapackages-local +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions Requires: javapackages-tools -BuildArch: noarch +Provides: %{base_name}-bootstrap +Obsoletes: %{base_name}-bootstrap +%endif %description Java Compiler Compiler (JavaCC) is the most popular parser generator @@ -45,65 +59,97 @@ with JavaCC), actions, debugging, etc. %package manual -Summary: A Parser and Scanner Generator for Java -Group: Development/Libraries/Java +Summary: Manual for %{name} +Group: Documentation/Other %description manual -Java Compiler Compiler (JavaCC) is the most popular parser generator -for use with Java applications. A parser generator is a tool that reads -a grammar specification and converts it to a Java program that can -recognize matches to the grammar. In addition to the parser generator -itself, JavaCC provides other standard capabilities related to parser -generation such as tree building (via a tool called JJTree included -with JavaCC), actions, debugging, etc. +Manual for %{name}. %package demo -Summary: A Parser and Scanner Generator for Java +Summary: Examples for %{name} Group: Development/Libraries/Java +Requires: %{name} = %{version}-%{release} %description demo -Java Compiler Compiler (JavaCC) is the most popular parser generator -for use with Java applications. A parser generator is a tool that reads -a grammar specification and converts it to a Java program that can -recognize matches to the grammar. In addition to the parser generator -itself, JavaCC provides other standard capabilities related to parser -generation such as tree building (via a tool called JJTree included -with JavaCC), actions, debugging, etc. +Examples for %{name}. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +This package contains the API documentation for %{name}. %prep -%setup -q -n javacc -%patch0 -p1 -cp %{SOURCE1} javacc -cp %{SOURCE2} jjdoc -cp %{SOURCE3} jjtree -mv www/doc . +%setup -q -n %{base_name}-%{version} +rm -f lib/*.jar +%if %{without bootstrap} +rm -f bootstrap/javacc.jar +build-jar-repository -s -p bootstrap javacc + +find ./examples -type f -exec sed -i 's/\r//' {} \; + +# The pom dependencies are wrong +%pom_xpath_remove pom:project/pom:dependencies +%endif %build -ant \ +%{ant} \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ - -Dversion=%{version} \ +%if %{with bootstrap} jar +%else + jar javadoc +%endif %install -install -d -m 755 %{buildroot}%{_javadir} -install -m 644 bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -d -m 755 %{buildroot}%{_prefix}/bin -install -m 755 javacc jjdoc jjtree %{buildroot}%{_prefix}/bin -install -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -pr examples %{buildroot}%{_datadir}/%{name} -%fdupes -s %{buildroot}%{_datadir}/%{name} +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}.jar + +%if %{without bootstrap} + +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom +%add_maven_depmap %{base_name}.pom %{base_name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} +%fdupes -s www +%fdupes -s examples + +%jpackage_script javacc '' '' javacc javacc true +ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh +%jpackage_script jjdoc '' '' javacc jjdoc true +%jpackage_script jjtree '' '' javacc jjtree true +%endif + +%if %{with bootstrap} %files -%{_javadir}/*.jar -%doc LICENSE README -%defattr(0755,root,root,0755) -%{_bindir}/* +%{_javadir}/%{base_name}.jar +%else +%files -f .mfiles +%{_bindir}/javacc +%{_bindir}/javacc.sh +%{_bindir}/jjdoc +%{_bindir}/jjtree +%endif +%license LICENSE +%doc README +%if %{without bootstrap} %files manual -%doc doc/* +%doc www/* %files demo -%{_datadir}/%{name}/ +%doc examples + +%files javadoc +%license LICENSE +%{_javadocdir}/%{name} +%endif %changelog ++++++ javacc-5.0src.tar.gz -> 7.0.4.tar.gz ++++++ ++++ 114253 lines of diff (skipped) ++++++ _multibuild ++++++ <multibuild> <package>bootstrap</package> </multibuild>
