From deb3242c78e50b9f4bba6989ea85392b7f7a8c72 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Jul 27 2015 14:08:01 +0000 Subject: Fix build with latest versions of stringtemplate4 --- diff --git a/antlrworks.spec b/antlrworks.spec index b7f5a03..94425a4 100644 --- a/antlrworks.spec +++ b/antlrworks.spec @@ -1,6 +1,6 @@ Name: antlrworks Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Grammar development environment for ANTLR v3 grammars Group: Development/Tools @@ -20,6 +20,8 @@ BuildRequires: antlr3-tool >= 3.5 BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jgoodies-forms >= 1.7.1 +BuildRequires: stringtemplate +BuildRequires: stringtemplate4 Requires: antlr3-tool >= 3.5 Requires: graphviz # Owns /usr/share/icons/hicolor @@ -53,9 +55,13 @@ encountered by grammar developers. # Fix version sed -i "s|^version=.*|version=%{version}|" build.properties +# Add JARs to the default classpath folder +mkdir -p lib/ +build-jar-repository -s -p lib/ antlr3-runtime jgoodies-forms stringtemplate stringtemplate4/ST4 + %build -ant build -Daw.lib=%{_javadir} -Dantlr3.jar=antlr3-runtime.jar -Djgoodies.jar=jgoodies-forms.jar +ant build -Daw.lib=lib/ -Dantlr3.jar=antlr3-runtime.jar -Djgoodies.jar=jgoodies-forms.jar %install @@ -72,6 +78,8 @@ for i in 16 32 64; do install -Dpm 0644 resources/icons/app_${i}x$i.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x$i/apps/%{name}.png done + +%check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop @@ -99,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || : %changelog +* Mon Jul 27 2015 Mohamed El Morabity - 1.5.2-3 +- Fix build with latest versions of stringtemplate4 + * Tue Jun 16 2015 Fedora Release Engineering - 1.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild