[antlrworks/f17] Add missing jgoodies-common jar in wrapper script

Mohamed ElMorabity melmorabity at fedoraproject.org
Thu Feb 16 01:02:14 UTC 2012


commit b784c8c03b795c66e4f002b68b7cd2f45cc39be8
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Thu Feb 16 01:24:15 2012 +0100

    Add missing jgoodies-common jar in wrapper script

 antlrworks.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/antlrworks.spec b/antlrworks.spec
index ad4506d..99ab872 100644
--- a/antlrworks.spec
+++ b/antlrworks.spec
@@ -1,6 +1,6 @@
 Name:           antlrworks
 Version:        1.4.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Grammar development environment for ANTLR v3 grammars
 
 Group:          Development/Tools
@@ -13,13 +13,13 @@ Patch0:         %{name}-1.4-build.patch
 # Add xdg-open and epiphany as available web browsers to open help (sent
 # upstream)
 Patch1:         %{name}-1.4-browsers.patch
-# Fix compilation with JGoodies Forms 1.4.2
+# Fix compilation with JGoodies Forms >= 1.4.2
 Patch2:         %{name}-1.4-jgoodies-forms_1.4.2.patch
 # Fix compilation with OpenJDK 7
 Patch3:         %{name}-1.4.3-jdk7.patch
 
 BuildRequires:  ant
-BuildRequires:  antlr3-tool
+BuildRequires:  antlr3-tool >= 3.3
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jgoodies-forms
@@ -65,7 +65,7 @@ ant build
 %install
 install -Dpm 0644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-%jpackage_script org.antlr.works.IDE "-Xmx400m" "" antlrworks:antlr:antlr3:antlr3-runtime:jgoodies-forms:stringtemplate:stringtemplate4 %{name} true
+%jpackage_script org.antlr.works.IDE "-Xmx400m" "" antlrworks:antlr:antlr3:antlr3-runtime:jgoodies-common:jgoodies-forms:stringtemplate:stringtemplate4 %{name} true
 
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -84,7 +84,7 @@ touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null || :
 
 
 %postun
-if [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
 fi
@@ -103,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor/ &>/dev/null || :
 
 
 %changelog
+* Thu Feb 16 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.4.3-4
+- Add missing jgoodies-common jar in wrapper script
+
 * Tue Feb 07 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.4.3-3
 - Add version condition on antlr3-tool
 - Fix wrapper script generation


More information about the scm-commits mailing list