From 99291b070985c5149e1a53a38a6cc0fe722e7753 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 1/5] Expand conditionals --- antlr.spec | 69 ------------------------------------------------------ 1 file changed, 69 deletions(-) diff --git a/antlr.spec b/antlr.spec index c66a0dd..a6361a0 100644 --- a/antlr.spec +++ b/antlr.spec @@ -1,5 +1,3 @@ -%bcond_without doxygen -%bcond_without python %global debug_package %{nil} # since we have only a static library @@ -22,26 +20,12 @@ Patch1: %{name}-%{version}-newgcc.patch # see BZ#848662 Patch2: antlr-examples-license.patch -%ifarch %{mono_arches} -%if ! 0%{?rhel} >= 6 -BuildRequires: mono-core -BuildRequires: mono-winforms -%endif -%endif BuildRequires: gcc-c++ BuildRequires: make BuildRequires: ant BuildRequires: java-devel >= 1:1.7.0 BuildRequires: java-javadoc BuildRequires: javapackages-local -%if %{with doxygen} -BuildRequires: doxygen graphviz -%endif -%if %{with python} -# Do not support Python3 -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%endif %description ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a @@ -86,30 +70,7 @@ Provides: antlr-static = %{version}-%{release} %description C++ This package provides a static C++ library for parsers generated by ANTLR2. -%if %{with doxygen} -%package C++-doc -Summary: Documentation for C++ bindings for antlr2 generated parsers -BuildArch: noarch -%description C++-doc -This package contains the documentation for the C++ bindings for parsers -generated by ANTLR2. -%endif - -%if %{with python} -%package -n python2-%{name} -Summary: Python 2 runtime support for ANTLR-generated parsers -%{?python_provide:%python_provide python2-%{name}} - -# This can be removed in Fedora 30 -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < 2.7.7-48 - -BuildArch: noarch - -%description -n python2-%{name} -Python runtime support for ANTLR-generated parsers -%endif %prep %setup -q @@ -138,20 +99,7 @@ rm antlr.jar rm doc/{Makefile,Makefile.in} chmod 0644 doc/* -%if %{with doxygen} -# generate doxygen docs for C++ bindings -pushd lib/cpp - doxygen doxygen.cfg - find gen_doc -type f -exec chmod 0644 {} \; -popd -%endif -%if %{with python} -# build python -cd lib/python -%py2_build -cd ../../ -%endif %install # jars, POM and depmap @@ -168,12 +116,6 @@ install -p -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{_includedir}/%{name} install -p -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir} install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir} -%if %{with python} -# python -cd lib/python -%py2_install -cd ../.. -%endif %files tool -f .mfiles @@ -189,11 +131,6 @@ cd ../.. %{_libdir}/libantlr.a %{_bindir}/antlr-config -%if %{with doxygen} -%files C++-doc -%license LICENSE.txt -%doc lib/cpp/gen_doc/html/ -%endif %files manual %license LICENSE.txt @@ -202,12 +139,6 @@ cd ../.. %files javadoc -f .mfiles-javadoc %license LICENSE.txt -%if %{with python} -%files -n python2-%{name} -%license LICENSE.txt -%{python2_sitelib}/antlr/* -%{python2_sitelib}/antlr-* -%endif %changelog * Mon Jul 30 2018 Severin Gehwolf - 0:2.7.7-56 From f03c3d06216dca4453986944f3771c6e86f643fd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 2/5] Remove explicit Epoch --- antlr.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/antlr.spec b/antlr.spec index a6361a0..a2c4447 100644 --- a/antlr.spec +++ b/antlr.spec @@ -6,7 +6,6 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.7 Release: 56%{?dist} -Epoch: 0 License: ANTLR-PD URL: http://www.antlr2.org/ # ./generate-tarball.sh From 89af9962b1feb36baa19b624f792ca5c00122eba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:13 +0200 Subject: [PATCH 3/5] Mass rebuild for javapackages-tools 201901 --- antlr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr.spec b/antlr.spec index a2c4447..0b4eefd 100644 --- a/antlr.spec +++ b/antlr.spec @@ -5,7 +5,7 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.7 -Release: 56%{?dist} +Release: 57%{?dist} License: ANTLR-PD URL: http://www.antlr2.org/ # ./generate-tarball.sh @@ -140,6 +140,9 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir} %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.7.7-57 +- Mass rebuild for javapackages-tools 201901 + * Mon Jul 30 2018 Severin Gehwolf - 0:2.7.7-56 - Add explicit requirement of javapackages-tools. From 781cb97020d477881096a52da2e565bb71dd781d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:21:05 +0200 Subject: [PATCH 4/5] Drop BR on java-javadoc --- antlr.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/antlr.spec b/antlr.spec index 0b4eefd..95c1036 100644 --- a/antlr.spec +++ b/antlr.spec @@ -23,7 +23,6 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: ant BuildRequires: java-devel >= 1:1.7.0 -BuildRequires: java-javadoc BuildRequires: javapackages-local %description From 597790b99a6ebd5f0f622dc9c6b9b63e8325d940 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 5/5] Mass rebuild for javapackages-tools 201902 --- antlr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr.spec b/antlr.spec index 95c1036..6b022fd 100644 --- a/antlr.spec +++ b/antlr.spec @@ -5,7 +5,7 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.7 -Release: 57%{?dist} +Release: 58%{?dist} License: ANTLR-PD URL: http://www.antlr2.org/ # ./generate-tarball.sh @@ -139,6 +139,9 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir} %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.7.7-58 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 2.7.7-57 - Mass rebuild for javapackages-tools 201901