fedora/spec update: don't bundle GmmLib into intel-opencl package

Change-Id: I03243d0c7ca321aff23d514ff577d30827e6a4d1
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

Author: ArturHarasimiuk

manifests/manifest.yml

@@ -17,7 +17,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: 0ebc3bbf7cb04b1f83414ab377471370dbf99952
+    revision: eade0467ece7979fabf79bab5b43fedfb562657d
     type: git
   internal:
     branch: master

scripts/build_spec.py

@@ -6,7 +6,7 @@
 #
 
 # Usage:
-# ./scripts/build_spec.py manifests/manifest.yml scripts/fedora.spec.in <version> <revision>
+# ./scripts/build_spec.py scripts/fedora.spec.in <version> <revision>
 #
 
 import datetime
@@ -15,45 +15,34 @@
 import sys
 import yaml
 
-if len(sys.argv) < 5:
+if len(sys.argv) < 4:
     print "ERROR! invalid number of parameters"
     print
     print "Usage:"
-    print "  ./scripts/build_spec.py <manifest> <spec.in> <version> <revision>"
+    print "  ./scripts/build_spec.py <spec.in> <version> <revision>"
     print
     sys.exit(1)
 
-manifest_file = sys.argv[1]
-
 repo = git.Repo(".")
 neo_revision = repo.head.commit
 
-with open(manifest_file, 'r') as f:
-    manifest = yaml.load(f)
-
-gmmlib_revision = manifest['components']['gmmlib']['revision']
-
 c = repo.commit(neo_revision)
 cd = datetime.datetime.fromtimestamp(c.committed_date)
 
-pkg_version = "%s.%s.%s" %(str(cd.isocalendar()[0])[-2:], cd.isocalendar()[1], sys.argv[3])
+pkg_version = "%s.%s.%s" %(str(cd.isocalendar()[0])[-2:], cd.isocalendar()[1], sys.argv[2])
 
-with open(sys.argv[2], 'r') as f:
+with open(sys.argv[1], 'r') as f:
     for line in f.readlines():
         if not re.match(".*__NEO_COMMIT_ID__$", line.strip()) is None:
             print "%s" % (line.rstrip().replace("__NEO_COMMIT_ID__", "%s" % neo_revision))
             continue
 
-        if not re.match(".*__GMMLIB_COMMIT_ID__$", line.strip()) is None:
-            print "%s" % (line.rstrip().replace("__GMMLIB_COMMIT_ID__", "%s" % gmmlib_revision))
-            continue
-
         if not re.match(".*__NEO_PACKAGE_VERSION__$", line.strip()) is None:
             print "%s" % (line.rstrip().replace("__NEO_PACKAGE_VERSION__", "%s" % pkg_version))
             continue
 
         if not re.match(".*__NEO_PACKAGE_RELEASE__.*", line.strip()) is None:
-            print "%s" % (line.rstrip().replace("__NEO_PACKAGE_RELEASE__", "%s" % sys.argv[4]))
+            print "%s" % (line.rstrip().replace("__NEO_PACKAGE_RELEASE__", "%s" % sys.argv[3]))
             continue
 
         print line.rstrip()

scripts/fedora.spec.in

@@ -1,5 +1,5 @@
 %global neo_commit_id __NEO_COMMIT_ID__
-%global gmmlib_commit_id __GMMLIB_COMMIT_ID__
+%global gmmlib_version_required 18.4.348
 %global igc_version_required 18.44.1060
 
 Name: intel-opencl
@@ -11,7 +11,6 @@ Group: System Environment/Libraries
 License: MIT
 URL: https://github.com/intel/compute-runtime
 Source0: https://github.com/intel/compute-runtime/archive/%{neo_commit_id}.tar.gz
-Source1: https://github.com/intel/gmmlib/archive/%{gmmlib_commit_id}.tar.gz
 
 %if 0%{?el7}
 BuildRequires: centos-release-scl epel-release
@@ -21,6 +20,9 @@ BuildRequires: gcc-c++ ninja-build make procps python2 libva-devel
 BuildRequires: cmake clang gcc-c++ ninja-build make procps python2 sed libva-devel
 %endif
 
+BuildRequires: intel-gmmlib-devel >= %{gmmlib_version_required}
+Requires: intel-gmmlib >= %{gmmlib_version_required}
+
 BuildRequires: intel-igc-opencl-devel >= %{igc_version_required}
 Requires: intel-igc-opencl >= %{igc_version_required}
 
@@ -36,7 +38,6 @@ rm -rf *
 
 mkdir neo gmmlib
 tar xzf $RPM_SOURCE_DIR/%{neo_commit_id}.tar.gz -C neo --strip-components=1
-tar xzf $RPM_SOURCE_DIR/%{gmmlib_commit_id}.tar.gz -C gmmlib --strip-components=1
 
 mkdir build
 cd build
@@ -57,17 +58,14 @@ echo "==== INSTALL ===="
 mkdir -p $RPM_BUILD_ROOT/usr/lib64
 mkdir -p $RPM_BUILD_ROOT/etc/OpenCL/vendors
 cp $RPM_BUILD_DIR/build/bin/libigdrcl.so $RPM_BUILD_ROOT/usr/lib64/
-cp $RPM_BUILD_DIR/build/bin/libigdgmm.so $RPM_BUILD_ROOT/usr/lib64/
 strip $RPM_BUILD_ROOT/usr/lib64/libigdrcl.so
-strip $RPM_BUILD_ROOT/usr/lib64/libigdgmm.so
 echo "/usr/lib64/libigdrcl.so" > $RPM_BUILD_ROOT/etc/OpenCL/vendors/intel.icd
 echo "==== DONE ===="
 
 
 %files
 %defattr(-,root,root)
 /usr/lib64/libigdrcl.so
-/usr/lib64/libigdgmm.so
 
 %config(noreplace)
 /etc/OpenCL/vendors/intel.icd