Hello community, here is the log from the commit of package antlr for openSUSE:Leap:15.2 checked in at 2020-02-05 07:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/antlr (Old) and /work/SRC/openSUSE:Leap:15.2/.antlr.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "antlr" Wed Feb 5 07:27:34 2020 rev:34 rq:763172 version:2.7.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/antlr/antlr-bootstrap.changes 2020-01-15 14:46:56.737275905 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.antlr.new.26092/antlr-bootstrap.changes 2020-02-05 07:27:35.226700416 +0100 @@ -1,0 +2,22 @@ +Fri Aug 2 06:53:31 UTC 2019 - Martin Liška <mli...@suse.cz> + +- Use FAT LTO objects in order to provide proper static library. + +------------------------------------------------------------------- +Thu May 9 12:54:52 UTC 2019 - Bernhard Wiedemann <bwiedem...@suse.com> + +- Drop unused BuildRequires: zip+unzip + +------------------------------------------------------------------- +Fri Feb 1 11:19:37 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Speed-up build by compiling all *.java files in one javac + invocation + +------------------------------------------------------------------- +Tue May 15 05:55:58 UTC 2018 - fst...@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Leap:15.2/antlr/antlr.changes 2020-01-15 14:46:56.861275998 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.antlr.new.26092/antlr.changes 2020-02-05 07:27:35.314700453 +0100 @@ -1,0 +2,33 @@ +Mon Jan 6 09:32:44 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Not only provide python-antlr, but also obsolete it + +------------------------------------------------------------------- +Wed Jul 31 08:51:20 UTC 2019 - Martin Liška <mli...@suse.cz> + +- Use FAT LTO objects in order to provide proper static library. + +------------------------------------------------------------------- +Sun Nov 18 19:43:07 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Install as maven artifact using the pom file from maven central + +------------------------------------------------------------------- +Thu Sep 13 08:55:01 UTC 2018 - Tomáš Chvátal <tchva...@suse.com> + +- Do not create compat symlink for python stuff as it was not working + before anyway +- Rename python package to python2-antlr (provide old symbol) + +------------------------------------------------------------------- +Fri Jul 20 15:27:49 UTC 2018 - tchva...@suse.com + +- Do not use old compat macros for python directories + +------------------------------------------------------------------- +Tue May 15 05:54:51 UTC 2018 - fst...@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility + +------------------------------------------------------------------- Old: ---- makefile.gcj New: ---- antlr-2.7.7.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ antlr-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.GqFuCi/_old 2020-02-05 07:27:35.694700612 +0100 +++ /var/tmp/diff_new_pack.GqFuCi/_new 2020-02-05 07:27:35.694700612 +0100 @@ -1,7 +1,7 @@ # # spec file for package antlr-bootstrap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -24,12 +24,10 @@ Summary: Antlr for bootstrapping purposes License: BSD-3-Clause AND SUSE-Public-Domain Group: Development/Libraries/Java -Url: http://www.antlr.org +URL: http://www.antlr.org Source0: antlr-%{version}.tar.bz2 Source1: manifest.antlr -BuildRequires: java-devel >= 1.6 -BuildRequires: unzip -BuildRequires: zip +BuildRequires: java-devel >= 1.8 BuildArch: noarch %description @@ -40,6 +38,7 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || : %build +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects #>>> some useful functions ... used throughout bootstrap packages # variables: TARGET_DIR=`pwd` @@ -48,10 +47,7 @@ function delBinaryFiles() { set +x echo deleting binary files ... - for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` - do - rm -rf $file - done + find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*" -delete set -x } #>>> make %{?_smp_mflags} a string with all jar files found in target folder that can be used for a classpath string @@ -71,11 +67,8 @@ mkTargetClasspath set +x COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} - echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH \$file - for file in `find . -name "*.java"` - do - echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c" - $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file + echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs)" + $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs) # check for errors if [ $? != 0 ] then @@ -83,7 +76,6 @@ exit 1; fi echo done - done set -x } #>>> make %{?_smp_mflags} jar archive @@ -94,7 +86,7 @@ xargs jar cfm ${1}.jar manifest.* ; mv ${1}.jar $TARGET_DIR } -COMPILER_COMMAND="javac -source 1.6 -target 1.6 -cp " +COMPILER_COMMAND="javac -source 8 -target 8 -cp " delBinaryFiles mkdir src mv antlr src ++++++ antlr.spec ++++++ --- /var/tmp/diff_new_pack.GqFuCi/_old 2020-02-05 07:27:35.710700619 +0100 +++ /var/tmp/diff_new_pack.GqFuCi/_new 2020-02-05 07:27:35.710700619 +0100 @@ -1,7 +1,7 @@ # # spec file for package antlr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -21,13 +21,13 @@ Version: 2.7.7 Release: 0 Summary: Another Tool for Language Recognition -License: GPL-2.0+ AND SUSE-Public-Domain AND MIT +License: GPL-2.0-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Other -Url: http://www.antlr.org/ +URL: http://www.antlr.org/ Source0: antlr-%{version}.tar.bz2 Source1: %{name}-build.xml Source2: %{name}-script -Source3: makefile.gcj +Source3: http://repo2.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source1000: antlr-rpmlintrc Patch0: %{name}-jedit.patch Patch1: gcc45fix.diff @@ -35,16 +35,16 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: java-devel >= 1.6 -BuildRequires: javapackages-tools -%if %{with python2} -BuildRequires: python2-base -%endif +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: xml-commons-apis Requires: %{name}-java Provides: %{name}-bootstrap = %{version} Obsoletes: %{name}-bootstrap < %{version} Obsoletes: %{name}-javadoc +%if %{with python2} +BuildRequires: python2-base +%endif %description ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a @@ -55,7 +55,7 @@ %package java Summary: ANother Tool for Language Recognition (Manual) Group: Development/Tools/Other -Requires: java >= 1.6 +Requires: java >= 1.8 BuildArch: noarch %description java @@ -93,12 +93,14 @@ This package provides the C++ runtime (libantlr.a) and a headers files of antlr -%package -n python-%{name} +%package -n python2-%{name} Summary: ANother Tool for Language Recognition (python runtime) Group: Development/Tools/Other Requires: antlr +Provides: python-%{name} +Obsoletes: python-%{name} -%description -n python-%{name} +%description -n python2-%{name} Python support for generating your Lexers, Parsers and TreeParsers in Python. This feature extends the benefits of ANTLR's predicated-LL(k) parsing technology to the Python language and platform. @@ -121,9 +123,10 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || : %build +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects ant \ -Dj2se.apidoc=%{_javadocdir}/java \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ jar %configure make -j1 @@ -132,7 +135,7 @@ %endif %install -#### jars ### +### jars ### install -d -m 0755 %{buildroot}%{_javadir} cp -a work/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -s -f ${jar} `echo $jar| sed "s|-%{version}||g"`; done) @@ -140,6 +143,11 @@ install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/ ln -s -f %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_datadir}/%{name}-%{version}/%{name}.jar +### pom ### +install -d -m 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a %{name}:%{name}all -f java + ### scripts ### install -d -m 0755 %{buildroot}%{_bindir}/ install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name} @@ -147,11 +155,8 @@ ### python runtime ### %if %{with python2} -install -d -m 0755 %{buildroot}%{py_sitedir}/%{name} -cp -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{name} -# compat symlink -ln -s -f %{py_sitedir}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/ -ln -s -f %{py_sitedir}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/ +install -d -m 0755 %{buildroot}%{python_sitearch}/%{name} +cp -a lib/python/antlr/* %{buildroot}%{python_sitearch}/%{name} %endif ### cpp runtime ### @@ -167,7 +172,8 @@ %fdupes -s doc %files -%doc LICENSE.txt README.txt CHANGES.txt +%license LICENSE.txt +%doc README.txt CHANGES.txt %dir %{_datadir}/%{name}-%{version} %{_bindir}/antlr %{_bindir}/antlr-config @@ -176,6 +182,12 @@ %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/*jar %{_javadir}/%{name}*.jar +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-java +%else +%{_datadir}/maven-metadata/%{name}-java.xml +%endif %files manual %doc doc examples @@ -185,11 +197,9 @@ %{_includedir}/%{name} %if %{with python2} -%files -n python-%{name} +%files -n python2-%{name} %dir %{_datadir}/%{name}-%{version} -%{_datadir}/%{name}-%{version}/*py -%{_datadir}/%{name}-%{version}/*pyc -%{py_sitedir}/%{name} +%{python_sitearch}/%{name} %endif %changelog ++++++ antlr-2.7.7.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>antlr</groupId> <artifactId>antlr</artifactId> <packaging>jar</packaging> <version>2.7.7</version> <name>AntLR Parser Generator</name> <description> A framework for constructing recognizers, compilers, and translators from grammatical descriptions containing Java, C#, C++, or Python actions. </description> <url>http://www.antlr.org/</url> <licenses> <license> <name>BSD License</name> <url>http://www.antlr.org/license.html</url> <distribution>repo</distribution> </license> </licenses> <dependencies/> </project>
