Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16232 Modified Files: xorg-x11-drv-catalyst.spec Log Message: * Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 15.7-1 - Update to Catalyst 15.7 (internal version 15.20.1046) Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/xorg-x11-drv-catalyst.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-catalyst.spec 11 Jul 2015 14:52:38 -0000 1.11 +++ xorg-x11-drv-catalyst.spec 11 Jul 2015 15:43:51 -0000 1.12 @@ -4,7 +4,8 @@ %global __strip /bin/true Name: xorg-x11-drv-catalyst -Version: 15.20 +Epoch: 1 +Version: 15.7 Release: 1%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support @@ -32,23 +33,23 @@ ExclusiveArch: i386 x86_64 %endif -Requires: catalyst-kmod >= %{version} +Requires: catalyst-kmod >= %{?epoch}:%{version} # Needed in all nvidia or fglrx driver packages BuildRequires: desktop-file-utils # It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12 BuildRequires: chrpath %if 0%{?fedora} > 10 || 0%{?rhel} > 5 -Requires: %{name}-libs%{_isa} = %{version}-%{release} +Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} %else -Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} %endif Requires(post): chkconfig Requires(preun): chkconfig -Provides: catalyst-kmod-common = %{version} +Provides: catalyst-kmod-common = %{?epoch}:%{version} Conflicts: xorg-x11-drv-nvidia Conflicts: xorg-x11-drv-nvidia-legacy Conflicts: xorg-x11-drv-nvidia-71xx @@ -58,7 +59,7 @@ Conflicts: xorg-x11-drv-nvidia-newest Conflicts: xorg-x11-drv-nvidia-custom Conflicts: xorg-x11-drv-fglrx -Obsoletes: catalyst-kmod < %{version} +Obsoletes: catalyst-kmod < %{?epoch}:%{version} # ATI auto-generated RPMs Conflicts: ATI-fglrx @@ -87,9 +88,9 @@ Summary: Development files for %{name} Group: Development/Libraries %if 0%{?fedora} > 10 || 0%{?rhel} > 5 -Requires: %{name}-libs%{_isa} = %{version}-%{release} +Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} %else -Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} %endif %description devel @@ -100,9 +101,9 @@ %package libs Summary: Libraries for %{name} Group: User Interface/X Hardware Support -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} Requires(post): ldconfig -Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release} %description libs This package provides the shared libraries for %{name}. @@ -310,11 +311,6 @@ %{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1 %{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1 fi - Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null) - if [ -n "${Catalyst_Version}" ]; then - %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1 - %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1 - fi fi ||: if [ "${1}" -eq 1 ]; then @@ -322,8 +318,15 @@ /sbin/chkconfig --add atieventsd /sbin/service atieventsd start >/dev/null 2>&1 if [ -x /sbin/grubby ] ; then - GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` - /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0 rd.driver.blacklist=radeon' &>/dev/null + KERNELS=`/sbin/grubby --default-kernel` + DIST=`rpm -E %%{?dist}` + ARCH=`uname -m` + [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}*` + for kernel in ${KERNELS} ; do + /sbin/grubby $ISGRUB1 \ + --update-kernel=${kernel} \ + --args="radeon.modeset=0 rd.driver.blacklist=radeon" &>/dev/null + done fi fi ||: @@ -334,9 +337,14 @@ /sbin/service atieventsd stop >/dev/null 2>&1 /sbin/chkconfig --del atieventsd if [ -x /sbin/grubby ] ; then - # remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation - GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` - /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon rd.driver.blacklist=radeon' &>/dev/null + DIST=`rpm -E %%{?dist}` + ARCH=`uname -m` + KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}*` + for kernel in ${KERNELS} ; do + /sbin/grubby $ISGRUB1 \ + --update-kernel=${kernel} \ + --remove-args="radeon.modeset=0 rdblacklist=radeon rd.driver.blacklist=radeon" &>/dev/null + done fi fi ||: @@ -404,6 +412,9 @@ %changelog +* Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 15.7-1 +- Update to Catalyst 15.7 (internal version 15.20.1046) + * Sun Apr 27 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 14.4-1 - Update to Catalyst 14.4 (internal version 14.10.1006)