diff --git a/cuda-toolfile.spec b/cuda-toolfile.spec index 615c94cf996..bb13b22fa86 100644 --- a/cuda-toolfile.spec +++ b/cuda-toolfile.spec @@ -35,9 +35,10 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cuda.xml - + + diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 7a33f2a8a8c..5e46cce505c 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,18 +1,25 @@ -### 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 gmake %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 \ 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