msimacek pushed to antlr3 (master). "Fix FTBFS"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Mar 30 13:17:37 UTC 2015
>From 3bb98850f50e17cea99550f1c52a6d9b52231714 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Mon, 30 Mar 2015 15:16:19 +0200
Subject: Fix FTBFS
diff --git a/antlr3.spec b/antlr3.spec
index b922940..e910a24 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -4,7 +4,7 @@
%global c_runtime_version 3.4
#%global python_runtime_version 3.1.3
%global javascript_runtime_version 3.1
-%global baserelease 5
+%global baserelease 6
Summary: ANother Tool for Language Recognition
Name: antlr3
@@ -18,21 +18,18 @@ Source3: http://www.antlr3.org/download/antlr-javascript-runtime-%{ja
Source9: antlr-runtime-MANIFEST.MF
Patch1: 0001-java8-fix.patch
License: BSD
+
BuildRequires: maven-local
-BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-install-plugin
-BuildRequires: buildnumber-maven-plugin
BuildRequires: junit
-BuildRequires: tomcat-servlet-3.0-api
BuildRequires: stringtemplate4
BuildRequires: stringtemplate
-BuildRequires: felix-parent
BuildRequires: antlr3-tool
-BuildRequires: autoconf automake libtool
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
# we don't build it now
Obsoletes: antlr3-gunit < 3.2-15
@@ -179,7 +176,7 @@ autoreconf -i
%{nil}
%endif
-sed -i "s/CFLAGS = .*/CFLAGS = $RPM_OPT_FLAGS/" Makefile
+sed -i "s#CFLAGS = .*#CFLAGS = $RPM_OPT_FLAGS#" Makefile
make %{?_smp_mflags}
doxygen -u # update doxygen configuration file
doxygen # build doxygen documentation
@@ -272,6 +269,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
%doc tool/LICENSE.txt
%changelog
+* Mon Mar 30 2015 Michael Simacek <msimacek at redhat.com> - 1:3.5.2-6
+- Fix FTBFS
+
* Mon Mar 23 2015 Dan HorĂ¡k <dan[at]danny.cz> - 1:3.5.2-5
- update BR - whole autotools chain is required explicitly
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/antlr3.git/commit/?h=master&id=3bb98850f50e17cea99550f1c52a6d9b52231714
More information about the scm-commits
mailing list