diff --git a/SPECS/devtoolset-7.spec b/SPECS/devtoolset-7.spec index 4b50f6d..862fe1b 100644 --- a/SPECS/devtoolset-7.spec +++ b/SPECS/devtoolset-7.spec @@ -8,8 +8,8 @@ Summary: Package that installs %scl Name: %scl_name -Version: 7.0 -Release: 8%{?dist} +Version: 7.1 +Release: 4%{?dist} License: GPLv2+ Group: Applications/File BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,10 +18,10 @@ Source0: README # following commands to generate the tarball: # git clone git://pkgs.devel.redhat.com/rpms/devtoolset-7-toolchain-docker -b devtoolset-7.0-rhel-7 # rm -rf devtoolset-7-toolchain-docker/.git{,ignore} -# tar cf - devtoolset-7-toolchain-docker | bzip2 -9 > devtoolset-7-toolchain-docker-%{df_toolchain_s}.tar.bz2 +# tar cf - devtoolset-7-toolchain-docker | bzip2 -9 > devtoolset-7-toolchain-docker-%%{df_toolchain_s}.tar.bz2 # git clone git://pkgs.devel.redhat.com/rpms/devtoolset-7-perftools-docker -b devtoolset-7.0-rhel-7 # rm -rf devtoolset-7-perftools-docker/.git{,ignore} -# tar cf - devtoolset-7-perftools-docker | bzip2 -9 > devtoolset-7-perftools-docker-%{df_perftools_s}.tar.bz2 +# tar cf - devtoolset-7-perftools-docker | bzip2 -9 > devtoolset-7-perftools-docker-%%{df_perftools_s}.tar.bz2 Source1: devtoolset-7-toolchain-docker-%{df_toolchain_s}.tar.bz2 Source2: devtoolset-7-perftools-docker-%{df_perftools_s}.tar.bz2 @@ -41,9 +41,13 @@ Summary: Package that handles %scl Software Collection. Group: Applications/File Requires: scl-utils >= 20120927-11 Obsoletes: %{name}-runtime < %{version}-%{release} +%if 0%{?rhel} >= 7 +Requires(post): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon +Requires(postun): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon +%else Requires(post): libselinux policycoreutils-python Requires(postun): libselinux policycoreutils-python -Requires(preun): libselinux policycoreutils-python +%endif %description runtime Package shipping essential scripts to work with %scl Software Collection. @@ -137,6 +141,7 @@ if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}" fi export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} +export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir32:%{_scl_root}\$rpmlibdir/dyninst\$rpmlibdir32/dyninst\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} # duplicate python site.py logic for sitepackages pythonvers=`python -c 'import sys; print sys.version[:3]'` export PYTHONPATH=%{_prefix}/lib64/python\$pythonvers/site-packages:%{_prefix}/lib/python\$pythonvers/site-packages\${PYTHONPATH:+:\${PYTHONPATH}} @@ -238,6 +243,18 @@ if [ $1 = 0 ]; then fi %changelog +* Fri Feb 23 2018 Marek Polacek - 7.1-4 +- add dyninst library path to LD_LIBRARY_PATH (#1540169) + +* Tue Feb 20 2018 Marek Polacek - 7.1-3 +- revert to old devtoolset-7-runtime Requires for RHEL 6 + +* Tue Feb 13 2018 Marek Polacek - 7.1-2 +- fix devtoolset-7-runtime Requires + +* Tue Dec 12 2017 Marek Polacek - 7.1-1 +- update for DTS 7.1 + * Fri Oct 06 2017 Marek Polacek - 7.0-8 - don't Require gcc for dockerfiles (#1499232) @@ -254,6 +271,9 @@ fi - drop devtoolset-7-{go,llvm,rust} on rhel6 and don't require them in -all on rhel6 (#1467194) +* Thu Jun 15 2017 Marek Polacek - 7.0-3 +- bump Release for rebuild + * Wed Jun 7 2017 Marek Polacek - 7.0-2 - update %files for the recently added subpackages