Hello community, here is the log from the commit of package javacc for openSUSE:Factory checked in at 2019-04-12 09:11:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc (Old) and /work/SRC/openSUSE:Factory/.javacc.new.27019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javacc" Fri Apr 12 09:11:45 2019 rev:21 rq:692640 version:7.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc/javacc.changes 2019-02-11 21:17:58.163318667 +0100 +++ /work/SRC/openSUSE:Factory/.javacc.new.27019/javacc.changes 2019-04-12 09:11:47.985600706 +0200 @@ -1,0 +2,7 @@ +Tue Apr 9 14:37:13 UTC 2019 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.9xpF9L/_old 2019-04-12 09:11:48.645600918 +0200 +++ /var/tmp/diff_new_pack.9xpF9L/_new 2019-04-12 09:11:48.645600918 +0200 @@ -17,7 +17,13 @@ # -Name: javacc +%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 @@ -26,13 +32,22 @@ 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: javacc 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 @@ -66,26 +81,38 @@ This package contains the API documentation for %{name}. %prep -%setup -q +%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 \ +%if %{with bootstrap} + jar +%else jar javadoc +%endif %install # jar install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +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}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar +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}/ @@ -98,14 +125,22 @@ %jpackage_script jjdoc '' '' javacc jjdoc true %jpackage_script jjtree '' '' javacc jjtree true +%endif + +%if %{with bootstrap} +%files +%{_javadir}/%{base_name}.jar +%else %files -f .mfiles -%license LICENSE -%doc README %{_bindir}/javacc %{_bindir}/javacc.sh %{_bindir}/jjdoc %{_bindir}/jjtree +%endif +%license LICENSE +%doc README +%if %{without bootstrap} %files manual %doc www/* @@ -115,5 +150,6 @@ %files javadoc %license LICENSE %{_javadocdir}/%{name} +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>bootstrap</package> </multibuild>
