commit 6e665dddfee7ed6add41e6f470cc8561c3a02272
Author: Elan Ruusamäe <[email protected]>
Date: Mon Jan 26 13:23:47 2015 +0200
use awk from PATH
awk.patch | 14 ++++++++++++++
netbeans-ide.spec | 5 ++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/netbeans-ide.spec b/netbeans-ide.spec
index 9adb229..73c1a74 100644
--- a/netbeans-ide.spec
+++ b/netbeans-ide.spec
@@ -1,7 +1,7 @@
Summary: NetBeans IDE - The Smarter and Faster Way to Code
Name: netbeans-ide
Version: 8.0.2
-Release: 0.1
+Release: 0.2
License: CDDL v1.0 and GPL v2 and others
Group: Development/Tools
# https://netbeans.org/downloads/zip.html
@@ -10,10 +10,12 @@ Source0:
http://download.netbeans.org/netbeans/%{version}/final/zip/netbeans-%{v
# NoSource, because huge download and package not finished yet
NoSource: 0
Source1: netbeans.desktop
+Patch0: awk.patch
URL: https://netbeans.org/features/
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: sed >= 4.0
BuildRequires: unzip
Requires: desktop-file-utils
Requires: jre >= 1.7
@@ -143,6 +145,7 @@ This package contains the javafx related parts of Netbeans
%prep
%setup -qc
mv netbeans/* .; rmdir netbeans
+%patch0 -p1
# remove windows executables and libraries
find -type f -name "*.exe" -print -delete
diff --git a/awk.patch b/awk.patch
new file mode 100644
index 0000000..2b58722
--- /dev/null
+++ b/awk.patch
@@ -0,0 +1,14 @@
+
+fix location of awk (/usr/bin/awk -> /bin/awk)
+
+--- netbeans-ide-8.0.2/platform/lib/nbexec~ 2014-11-18 19:37:20.000000000
+0200
++++ netbeans-ide-8.0.2/platform/lib/nbexec 2015-01-26 13:22:42.040832677
+0200
+@@ -198,7 +198,7 @@
+ SunOS*) awk=nawk ;;
+ *) awk=awk ;;
+ esac
+- jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F
'"' '/version/ {print substr($2, 1, 3)}')
++ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | ${awk} -F '"'
'/version/ {print substr($2, 1, 3)}')
+ if [ "$jdk_version" = "1.7" ] ; then
+ jargs="$jargs $launcher_args"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netbeans-ide.git/commitdiff/6e665dddfee7ed6add41e6f470cc8561c3a02272
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
