[eclipse-veditor] Update to latest upstream release

[mbooth]

commit eda523878a643b1310a620757ed7c0eb708ac529
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sat Aug 17 15:42:42 2013 +0100

    Update to latest upstream release
    
    - Fix FTBFS rhbz #992178

 .gitignore            |    1 +
 eclipse-gtk-dir.patch |   10 +++++++
 eclipse-veditor.spec  |   67 +++++++++++++++++++++++++-----------------------
 sources               |    2 +-
 4 files changed, 47 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d526ac..1afe657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 veditor_0_6_3.tar.bz
 /veditor_0_7_1.tar.gz
+/veditor_1_2_0.tar.gz
diff --git a/eclipse-gtk-dir.patch b/eclipse-gtk-dir.patch
new file mode 100644
index 0000000..b28a384
--- /dev/null
+++ b/eclipse-gtk-dir.patch
@@ -0,0 +1,10 @@
+--- veditor/buildjavacc.xml.orig	2013-04-24 19:05:11.000000000 +0100
++++ veditor/buildjavacc.xml	2013-08-17 14:54:10.029891629 +0100
+@@ -33,6 +33,7 @@
+ 		<fileset dir="${eclipse_plugin_dir}">
+             <include name="**/*.jar"/>
+         </fileset>
++		<pathelement location="${eclipse_gtk_dir}"/>
+ 	</path>
+ 	
+    <target name="jjtree">       
diff --git a/eclipse-veditor.spec b/eclipse-veditor.spec
index 2971a98..0aa7c75 100644
--- a/eclipse-veditor.spec
+++ b/eclipse-veditor.spec
@@ -1,19 +1,18 @@
-%global install_loc     %{_datadir}/eclipse/dropins/
+%global install_loc     %{_datadir}/eclipse/dropins/veditor
 
-%define pkgname           veditor
-
-Name:           eclipse-%{pkgname}
-Version:        0.7.1
-Release:        6%{?dist}
+Name:           eclipse-veditor
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Eclipse-based Verilog/VHDL plugin
 
 Group:          Applications/Engineering
 License:        EPL
 URL:            http://sourceforge.net/projects/veditor/
 
-Source0:        http://downloads.sourceforge.net/sourceforge/%{pkgname}/%{pkgname}_0_7_1.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/veditor/veditor_1_2_0.tar.gz
+Patch0:         eclipse-gtk-dir.patch
 
-BuildRequires:  eclipse-platform
+BuildRequires:  eclipse-pde
 BuildRequires:  javacc
 BuildRequires:  java-devel
 BuildRequires:  ant
@@ -30,42 +29,46 @@ It provides Verilog(IEEE-1364) and VHDL language specific code
 viewer, contents outline, code assist etc. It helps coding and
 debugging in hardware development based on Verilog or VHDL.
 
-
 %prep
 %setup -q -c
+%patch0 -p0 -b.orig
+
+# Delete pre-built binaries
 find -name '*.jar' -exec rm -f '{}' \;
+find -name '*.class' -exec rm -f '{}' \;
 
-#Fixing Versions
-sed -i "s|0.6.1|0.7.1|" %{pkgname}/buildjavacc.xml
+# Fix ersion in build script to match manifest
+sed -i "s|1.1.1|1.2.0|" veditor/buildjavacc.xml
 
-#fixing rpmlint warnings
-#  spurious-executable-perm and end-of-type encodings
-for f in CONTRIBUTORS.txt ChangeLog.txt about.html ;
-do
-    sed 's|\r||' %{pkgname}/$f > $f ;
-    chmod -x $f;
+# Fix rpmlint warnings
+for f in CONTRIBUTORS.txt ChangeLog.txt about.html ; do
+    sed 's|\r||' veditor/$f > $f
 done
 
 %build
-export JAVACC_HOME=%{_datadir}/java
-export ECLIPSE_HOME=%{_libdir}/eclipse
-
-ant -verbose -f %{pkgname}/buildjavacc.xml export
-
+for d in %{_libdir}/eclipse/plugins/org.eclipse.swt.gtk.linux* ; do
+    if [ -d "$d" ] ; then
+        GTK_DIR=$d
+    fi
+done
+ant -verbose -f veditor/buildjavacc.xml export -Djavacc_dir=%{_javadir} \
+    -Declipse_plugin_dir=%{_libdir}/eclipse/plugins \
+    -Declipse_gtk_dir=$GTK_DIR
 
 %install
-%{__install} -d -m 755 %{buildroot}%{install_loc}
-%{__install} -pm 0644 \
-    %{pkgname}/net.sourceforge.%{pkgname}_%{version}.jar \
-    %{buildroot}%{install_loc}
-
+install -d -m 755 %{buildroot}%{install_loc}/plugins
+install -pm 0644 veditor/net.sourceforge.veditor_%{version}.jar \
+    %{buildroot}%{install_loc}/plugins
 
 %files
 %doc CONTRIBUTORS.txt ChangeLog.txt about.html
-%{install_loc}/*
-
+%{install_loc}
 
 %changelog
+* Sat Aug 17 2019 Mat Booth <fedora at matbooth.co.uk> 1.2.0-1
+- Update to latest upstream release
+- Fix FTBFS rhbz #992178
+
 * Mon Aug 12 2013 Alexander Kurtakov <akurtako at redhat.com> 0.7.1-6
 - Drop old things.
 
@@ -90,11 +93,11 @@ ant -verbose -f %{pkgname}/buildjavacc.xml export
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jun 17 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-3
+* Tue Jun 17 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-3
 - fixed source0's url
 
-* Tue Jun 16 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-2
+* Mon Jun 16 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-2
 - Tuned spec file for eclipse specific packaging guidelines
 
-* Sat May 23 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-1
+* Fri May 23 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 0.6.3-1
 - Initial Fedora Package
diff --git a/sources b/sources
index 5fc653a..3d7e280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45691c4ebc9de7babde07f8286c254bd  veditor_0_7_1.tar.gz
+7b37e805362b52e9e8c996b19917a177  veditor_1_2_0.tar.gz