Hello community, here is the log from the commit of package javacc for openSUSE:Factory checked in at 2019-02-11 21:17:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc (Old) and /work/SRC/openSUSE:Factory/.javacc.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javacc" Mon Feb 11 21:17:54 2019 rev:20 rq:672435 version:7.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc/javacc.changes 2017-09-20 17:09:32.336177720 +0200 +++ /work/SRC/openSUSE:Factory/.javacc.new.28833/javacc.changes 2019-02-11 21:17:58.163318667 +0100 @@ -1,0 +2,12 @@ +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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.ubO3Jx/_old 2019-02-11 21:17:58.915318268 +0100 +++ /var/tmp/diff_new_pack.ubO3Jx/_new 2019-02-11 21:17:58.919318266 +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,26 +13,24 @@ # 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 +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 BuildRequires: fdupes -BuildRequires: java-devel -BuildRequires: xml-commons-apis +BuildRequires: javacc +BuildRequires: javapackages-local +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions Requires: javapackages-tools BuildArch: noarch @@ -45,65 +44,76 @@ 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 + +find ./examples -type f -exec sed -i 's/\r//' {} \; + +# The pom dependencies are wrong +%pom_xpath_remove pom:project/pom:dependencies %build ant \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ - -Dversion=%{version} \ - jar + jar javadoc %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} - -%files -%{_javadir}/*.jar -%doc LICENSE README -%defattr(0755,root,root,0755) -%{_bindir}/* +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{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 + +%files -f .mfiles +%license LICENSE +%doc README +%{_bindir}/javacc +%{_bindir}/javacc.sh +%{_bindir}/jjdoc +%{_bindir}/jjtree %files manual -%doc doc/* +%doc www/* %files demo -%{_datadir}/%{name}/ +%doc examples + +%files javadoc +%license LICENSE +%{_javadocdir}/%{name} %changelog ++++++ javacc-5.0src.tar.gz -> 7.0.4.tar.gz ++++++ ++++ 114253 lines of diff (skipped)
