From da44a3baf723c39bcffbfce235df3e4a9c5e6d7661f727b730e4fdd746b5798a Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 8 Jun 2017 11:26:52 +0000 Subject: [PATCH] Accepting request 501880 from home:NMoreyChaisemartin:branches:science:HPC - Add _service - Auto extract patch from upstream tar - Add manifest-version.patch from upstream to fix internal version number. OBS-URL: https://build.opensuse.org/request/show/501880 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=29 --- _service | 22 ++++++++++++++++++++++ manifest-version.patch | 14 ++++++++++++++ opa-fmgui-10.1.0.0.tar.gz | 3 +++ opa-fmgui.changes | 8 ++++++++ opa-fmgui.spec | 23 +++++++++++++---------- opa-fmgui.tar.gz | 3 --- 6 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 _service create mode 100644 manifest-version.patch create mode 100644 opa-fmgui-10.1.0.0.tar.gz delete mode 100644 opa-fmgui.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..359ed24 --- /dev/null +++ b/_service @@ -0,0 +1,22 @@ + + + git + https://github.com/01org/opa-fmgui.git + no + .git + opa-fmgui + 10.1.0.0 + 814f72fc665e4143a25e3c685e784d2006898603 + + + opa-fmgui*.tar + gz + + + + + */*.patch + + opa-fmgui-*.tar.gz + + diff --git a/manifest-version.patch b/manifest-version.patch new file mode 100644 index 0000000..c0429ba --- /dev/null +++ b/manifest-version.patch @@ -0,0 +1,14 @@ +diff -Npru a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF +--- a/src/META-INF/MANIFEST.MF 2017-03-19 14:43:56.476594823 -0400 ++++ b/src/META-INF/MANIFEST.MF 2017-03-19 14:44:32.354453193 -0400 +@@ -6,8 +6,8 @@ Implementation-Title: Intel Fabric Manag + Implementation-Vendor: Intel Corporation + Implementation-Version: 10.0.0.DEV + Schema-Version: 37 +-Intel-OPAFM-Version: 10.1.0.0.112 +-Intel-Build-Id: 10_1_0_0_112 ++Intel-OPAFM-Version: 10.1.0.0.115 ++Intel-Build-Id: 10_1_0_0_115 + Intel-Build-Date: 2016-05-14 08:54:41 + Main-Class: com.intel.stl.main.FMGuiApp + diff --git a/opa-fmgui-10.1.0.0.tar.gz b/opa-fmgui-10.1.0.0.tar.gz new file mode 100644 index 0000000..c5bc797 --- /dev/null +++ b/opa-fmgui-10.1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c17ef61a7ebc2fffaa3cdce6261bb9be4394fea9f145507bc7395ba4a31c4ae +size 5976945 diff --git a/opa-fmgui.changes b/opa-fmgui.changes index 8c3a0c3..4a4aab1 100644 --- a/opa-fmgui.changes +++ b/opa-fmgui.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 8 10:08:04 UTC 2017 - nmoreychaisemartin@suse.com + +- Add _service +- Auto extract patch from upstream tar +- Add manifest-version.patch from upstream to fix internal + version number. + ------------------------------------------------------------------- Wed May 17 09:28:18 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/opa-fmgui.spec b/opa-fmgui.spec index d63d599..18538da 100644 --- a/opa-fmgui.spec +++ b/opa-fmgui.spec @@ -1,7 +1,7 @@ # # spec file for package opa-fmgui # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 Intel Corporation # # All modifications and additions to the file contributed by third parties @@ -31,7 +31,7 @@ Summary: Fabric Manager Graphical User Interface License: BSD-3-Clause and LGPL-2.0+ Group: Applications/System Url: http://www.intel.com/ -Source0: opa-fmgui.tar.gz +Source0: opa-fmgui-%{version}.tar.gz Source1: antlr-2.7.7.jar Source2: dom4j-1.6.1.jar # Source3: gritty.jar @@ -71,19 +71,21 @@ Source36: swingx-testsupport-1.6.5.jar Source37: gradle-%{gradle_version}-bin.zip Patch1: gradle-use_local_repo.patch -Patch3: opa-fmgui-intel-manifest-license.patch +Patch3: opa-fmgui-intel-manifest-license.patch +# Patch auto extracted by service Patch5: stl-14927-jgraphx-update.patch +Patch6: manifest-version.patch BuildRequires: ant BuildRequires: jre >= 1.7 -Requires: jre >= 1.7 -Requires: mlocate +Requires: jre >= 1.7 +Requires: mlocate +BuildRequires: hicolor-icon-theme BuildRequires: libgnome BuildRequires: openssl -BuildRequires: update-desktop-files -BuildRequires: hicolor-icon-theme -BuildRequires: wget BuildRequires: unzip +BuildRequires: update-desktop-files +BuildRequires: wget # BuildRequires: gradle BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -93,13 +95,14 @@ FMGUI is the Fabric Manager Graphical User Interface. It can be run by invoking script fmgui. %prep -%setup -q -n opa-fmgui +%setup -q -n opa-fmgui-%{version} %patch1 -p1 %patch3 -p1 %patch5 -p1 +%patch6 -p1 %build -(cd %{_tmppath}; unzip $RPM_SOURCE_DIR/gradle-%{gradle_version}-bin.zip) +(cd %{_tmppath}; rm -Rf gradle-%{gradle_version}; unzip $RPM_SOURCE_DIR/gradle-%{gradle_version}-bin.zip) GRADLE_LIB_DIR=$RPM_SOURCE_DIR export GRADLE_LIB_DIR %{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps build --info diff --git a/opa-fmgui.tar.gz b/opa-fmgui.tar.gz deleted file mode 100644 index 086570e..0000000 --- a/opa-fmgui.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:076e230b4c7cf8f74afb50de666ea524744aa6a4a3c84ac103b35074c09fb958 -size 6003007