rpm/opa-fmgui
SHA256
1
0
Fork 0
forked from pool/opa-fmgui
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=3

Browse Source
This commit is contained in:
Josef Möllers 2017-04-05 08:52:31 +00:00 committed by Git OBS Bridge
parent aff205fb2b
commit d335cac299
6 changed files with 18 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opa-fmgui-desktopfile-without-binary.patch
View File

@ -1,16 +0,0 @@
diff --git a/install/fmgui.desktop b/install/fmgui.desktop
index b871a44..743b635 100644
--- a/install/fmgui.desktop
+++ b/install/fmgui.desktop
@@ -2,8 +2,8 @@
Encoding=UTF-8
GenericName=Fabric Manager GUI
Name=Fabric Manager GUI
-Exec=/usr/local/bin/fmgui
+Exec=fmgui
Icon=fmgui
Terminal=false
Type=Application
-Categories=Application;Fabric;System;
\ No newline at end of file
+Categories=Application;Fabric;System;

13
opa-fmgui-fix-detection-of-OpenJDK.patch
View File

@ -1,13 +0,0 @@
diff -urN opa-fmgui-orig/install/fmgui.sh opa-fmgui/install/fmgui.sh
--- opa-fmgui-orig/install/fmgui.sh 2016-09-12 08:01:52.027654361 -0400
+++ opa-fmgui/install/fmgui.sh 2016-09-12 08:04:05.636122357 -0400
@@ -7,7 +7,7 @@
if [ $DEBUG -eq 1 ]; then
echo Checking JVM $2
fi
-JVER=`$2 -version 2>&1 | grep "java version" | awk '{print substr($3, 2, 3);}' | sed -e 's;\.;0;g'`
+JVER=`$2 -version 2>&1 | grep "version" | awk '{print substr($3, 2, 3);}' | sed -e 's;\.;0;g'`
if [ $JVER ]; then
if [ $JVER -ge $JAVA_REQ ]; then
if [ $DEBUG -eq 1 ]; then

50
opa-fmgui-intel-manifest-license.patch
View File

@ -1,27 +1,12 @@
--- opa-fmgui-orig/install/fmgui.desktop 2016-07-20 13:20:20.448436298 -0400
+++ opa-fmgui-orig/install/fmgui.desktop 2016-07-20 12:41:41.360388422 -0400
@@ -2,8 +2,8 @@
Encoding=UTF-8
GenericName=Fabric Manager GUI
Name=Fabric Manager GUI
-Exec=fmgui
+Exec=/usr/bin/opa-fmgui
Index: opa-fmgui/install/fmgui.desktop
===================================================================
--- opa-fmgui.orig/install/fmgui.desktop
+++ opa-fmgui/install/fmgui.desktop
@@ -6,3 +6,4 @@ Exec=/usr/bin/opa-fmgui
Icon=fmgui
Terminal=false
Type=Application
-Categories=Application;Fabric;System;
+Categories=Application;Fabric;System;
--- opa-fmgui-orig/install/fmgui.sh 2016-07-19 11:38:59.072516955 -0400
+++ opa-fmgui-orig/install/fmgui.sh 2016-07-19 11:27:05.600866856 -0400
@@ -22,7 +22,7 @@
JAVA_REQ=`echo 1.7 | sed -e 's;\.;0;g'`
INSTDIR=`dirname $0`
JAVA=nojava
-JAR=/usr/share/java/fmgui/fmgui.jar
+JAR=/usr/share/java/opa-fmgui/fmgui.jar
if [ -n "$OPA_JAVA" ]; then
# Check what's been provided in environment variable OPA_JAVA
--- opa-fmgui-orig/licenses/gritty_license.txt 1969-12-31 19:00:00.000000000 -0500
+++ opa-fmgui-orig/licenses/gritty_license.txt 2016-07-19 12:37:12.322352099 -0400
@@ -0,0 +1,482 @@
@ -2693,28 +2678,3 @@
+ Ty Coon, President of Vice
+
+That's all there is to it!
--- opa-fmgui-orig/util/postsetup.sh 2016-07-19 13:44:04.889032309 -0400
+++ opa-fmgui-orig/util/postsetup.sh 2016-07-19 13:44:36.751595062 -0400
@@ -8,7 +8,7 @@
\cp -f $THISDIR/ClearFMGUICache.desktop $HOME/.local/share/applications/ClearFMGUICache.desktop
chmod 744 $HOME/.local/share/applications/ClearFMGUICache.desktop
mkdir -p $HOME/.local/share/desktop-directories
-cp -a /usr/local/share/desktop-directories/Fabric.directory $HOME/.local/share/desktop-directories/Fabric.directory
+cp -a /usr/share/desktop-directories/Fabric.directory $HOME/.local/share/desktop-directories/Fabric.directory
mkdir -p $HOME/.config/menus/applications-merged
cp -a /etc/xdg/menus/applications-merged/Fabric.menu $HOME/.config/menus/applications-merged/Fabric.menu
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
index b287ddf..5a71b66 100644
--- a/src/META-INF/MANIFEST.MF
+++ b/src/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Intel-OPAFM-Version: 10.0.0.0.691
Intel-Build-Id: 10_0_0_0_691
Intel-Build-Date: 2016-01-26 22:42:31
Main-Class: com.intel.stl.main.FMGuiApp
-Class-Path: . lib/antlr-2.7.7.jar lib/dom4j-1.6.1.jar lib/gritty-0.02.
+Class-Path: . lib/antlr-2.7.7.jar lib/dom4j-1.6.1.jar lib/gritty.
jar lib/hibernate-commons-annotations-4.0.4.Final.jar lib/hibernate-c
ore-4.3.5.Final.jar lib/hibernate-entitymanager-4.3.5.Final.jar lib/h
ibernate-jpa-2.1-api-1.0.0.Final.jar lib/hsqldb-2.3.2.jar lib/jandex-1.1.0.

10
opa-fmgui.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Apr 5 08:46:46 UTC 2017 - josef.moellers@suse.com
- Upgrade to Version 10.1.0.0
This obsoletes Patches
2:opa-fmgui-desktopfile-without-binary.patch
and
4:opa-fmgui-fix-detection-of-OpenJDK.patch
[FATE#321477]
-------------------------------------------------------------------
Tue Oct 4 18:35:02 CEST 2016 - ndas@suse.de

6
opa-fmgui.spec
View File

@ -24,7 +24,7 @@
%define _binary_payload w9.gzdio
Name: opa-fmgui
Version: 10.0.0.0
Version: 10.1.0.0
Release: 0
Summary: Fabric Manager Graphical User Interface
License: BSD-3-Clause
@ -59,9 +59,7 @@ Source25: slf4j-api-1.7.7.jar
Source26: swingx-all-1.6.4.jar
Patch1: gradle-use_local_repo.patch
Patch2: opa-fmgui-desktopfile-without-binary.patch
Patch3: opa-fmgui-intel-manifest-license.patch
Patch4: opa-fmgui-fix-detection-of-OpenJDK.patch
BuildRequires: ant
BuildRequires: gradle-open-api
@ -82,9 +80,7 @@ script fmgui.
%prep
%setup -q -n opa-fmgui
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
GRADLE_LIB_DIR=$RPM_SOURCE_DIR

4
opa-fmgui.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74c27d9b44ca9140a90617872729608be9a887420dac7df0098f07baaadaecc7
size 68269331
oid sha256:076e230b4c7cf8f74afb50de666ea524744aa6a4a3c84ac103b35074c09fb958
size 6003007