From 5e082f32aa2acdba940734840a6335eca7185e72 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Wed, 26 Sep 2018 18:27:35 +0200 Subject: [PATCH 1/9] Update to 1.5.3 --- libjpeg-turbo.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 7a33f2a8a8c..4625c781953 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,24 +1,31 @@ -### RPM external libjpeg-turbo 1.3.1 -Source: http://heanet.dl.sourceforge.net/project/%{n}/%{realversion}/%{n}-%{realversion}.tar.gz +### RPM external libjpeg-turbo 1.5.3 +## INITENV SETV LIBJPEG_TURBO_SOURCE %{source0} +## INITENV SETV LIBJPEG_TURBO_STRIP_PREFIX %{source_prefix} -BuildRequires: nasm +%define source0 https://github.com/libjpeg-turbo/libjpeg-turbo/archive/%{realversion}.tar.gz +%define source_prefix %{n}-%{realversion} +Source: %{source0} + +BuildRequires: nasm autotools %prep -%setup -n %{n}-%{realversion} +%setup -n %{source_prefix} %build -# Update to get AArch64 +# Update to get AArch64 rm -f ./config.{sub,guess} curl -L -k -s -o ./config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' curl -L -k -s -o ./config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' chmod +x ./config.{sub,guess} +autoreconf -fiv + ./configure \ --prefix=%{i} \ --enable-shared \ --disable-static \ --with-jpeg8 \ - --disable-dependency-tracking + --disable-dependency-tracking make %{makeprocesses} %install From dd9f67570bb552dd5f5caf664f23d93a0dcf1dce Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 27 Sep 2018 11:39:13 +0200 Subject: [PATCH 2/9] Update libjpeg-turbo.spec add gmake dependency and retry to see if the install problem is still there --- libjpeg-turbo.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 4625c781953..d6236371a43 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -6,7 +6,7 @@ %define source_prefix %{n}-%{realversion} Source: %{source0} -BuildRequires: nasm autotools +BuildRequires: nasm autotools gmake %prep %setup -n %{source_prefix} @@ -21,11 +21,11 @@ chmod +x ./config.{sub,guess} autoreconf -fiv ./configure \ - --prefix=%{i} \ + --prefix="%{i}" \ --enable-shared \ --disable-static \ --with-jpeg8 \ - --disable-dependency-tracking + --disable-dependency-tracking make %{makeprocesses} %install From e32a1523bcab3b8eed0145dc7dc4b2d8a66d9dc0 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 27 Sep 2018 11:40:33 +0200 Subject: [PATCH 3/9] Update libjpeg-turbo.spec --- libjpeg-turbo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index d6236371a43..5e46cce505c 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -21,7 +21,7 @@ chmod +x ./config.{sub,guess} autoreconf -fiv ./configure \ - --prefix="%{i}" \ + --prefix=%{i} \ --enable-shared \ --disable-static \ --with-jpeg8 \ From d580c9c175438340c7d6dc34d140876b7a5cf0e0 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 27 Sep 2018 15:39:10 +0200 Subject: [PATCH 4/9] Fix pyqt to generate sip files in its own package directory --- pyqt.spec | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pyqt.spec b/pyqt.spec index 2c48d62fecb..bdf9b577d00 100644 --- a/pyqt.spec +++ b/pyqt.spec @@ -27,7 +27,7 @@ case %cmsos in ;; esac -echo yes | python ./configure.py --verbose -b %i/bin -d %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages \ +echo yes | python ./configure.py --sipdir=%{i}/share/PyQt4 --verbose -b %{i}/bin -d %{i}/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages \ -e %i/include \ `find $QT_ROOT/include/ -type d | xargs -n 1 basename| grep -v include | xargs echo | sed -e 's| | --enable=|g;s|^|--enable=|'` @@ -36,23 +36,5 @@ make %makeprocesses %install make install -mkdir -p %i/etc/profile.d -cat << \EOF_INIT_ME > %i/etc/profile.d/init-standalone.sh -#!/bin/sh -source @GCC_ROOT@/etc/profile.d/init.sh -source @BZ2LIB_ROOT@/etc/profile.d/init.sh -source @EXPAT_ROOT@/etc/profile.d/init.sh -source @DB4_ROOT@/etc/profile.d/init.sh -source @GDBM_ROOT@/etc/profile.d/init.sh -source @ZLIB_ROOT@/etc/profile.d/init.sh -source @OPENSSL_ROOT@/etc/profile.d/init.sh -source @PYTHON_ROOT@/etc/profile.d/init.sh -source @QT_ROOT@/etc/profile.d/init.sh -source @SIP_ROOT@/etc/profile.d/init.sh -source %i/etc/profile.d/init.sh -EOF_INIT_ME - -perl -p -i -e "s|\@([^@]*)\@|\$ENV{\$1}|" %i/etc/profile.d/init-standalone.sh - %post -%{relocateConfig}etc/profile.d/init-standalone.sh +ln -s dependencies-setup.sh $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init-standalone.sh From 7ccc95cded94d5fe12a2dd8ac741bdaf9ff78578 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 27 Sep 2018 18:11:12 +0200 Subject: [PATCH 5/9] Updated root to tip of branch v6-12-00-patches --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 5ba0c7031ff..1940348924b 100644 --- a/root.spec +++ b/root.spec @@ -2,8 +2,8 @@ ## INITENV +PATH PYTHON27PATH %{i}/lib ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag 8ea59a196e04c88776a05f9d20fac287f05224f6 -%define branch cms/v6-12-00-patches/aa726e2 +%define tag e322ecf869fdf9c226186552efdeb6a3e50d19bc +%define branch cms/v6-12-00-patches/34f75bf %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz From 89c8f32ddfb319f3e14b13456adc7bcbbabb4ebb Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Wed, 29 Aug 2018 16:55:46 +0200 Subject: [PATCH 6/9] Add support for Volta GPUs (sm_70) --- cuda-toolfile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cuda-toolfile.spec b/cuda-toolfile.spec index 615c94cf996..705961952f8 100644 --- a/cuda-toolfile.spec +++ b/cuda-toolfile.spec @@ -37,6 +37,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml + From 79e28ff509e9a7e489554e70f7df4c73dbe093f1 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Fri, 28 Sep 2018 18:38:27 +0200 Subject: [PATCH 7/9] Drop support for Maxwell GPUs (sm_50) --- cuda-toolfile.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cuda-toolfile.spec b/cuda-toolfile.spec index 705961952f8..0e88693940f 100644 --- a/cuda-toolfile.spec +++ b/cuda-toolfile.spec @@ -35,7 +35,6 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml - From 2f321196535251ea37a3e5646cb6c964482ca75e Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Fri, 28 Sep 2018 18:40:39 +0200 Subject: [PATCH 8/9] Keep source code information for device code --- cuda-toolfile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cuda-toolfile.spec b/cuda-toolfile.spec index 0e88693940f..bb13b22fa86 100644 --- a/cuda-toolfile.spec +++ b/cuda-toolfile.spec @@ -38,6 +38,7 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml + From 73c68e1404f88fb6766b372ab6a4c08897ac8061 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 1 Oct 2018 13:47:15 +0200 Subject: [PATCH 9/9] Updated root to tip of branch v6-12-00-patches --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 1940348924b..389ed36b853 100644 --- a/root.spec +++ b/root.spec @@ -2,8 +2,8 @@ ## INITENV +PATH PYTHON27PATH %{i}/lib ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag e322ecf869fdf9c226186552efdeb6a3e50d19bc -%define branch cms/v6-12-00-patches/34f75bf +%define tag 65a13405680d9570776fbe812af5970d9dc24394 +%define branch cms/v6-12-00-patches/785db9d %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz