Author: baggins Date: Sat Jul 17 14:28:35 2010 GMT Module: packages Tag: HEAD ---- Log message: - use bundled desktop files - fix patches to avoid descending into subdirectories for patching
---- Files affected: packages/xorg-driver-video-fglrx: xorg-driver-video-fglrx.spec (1.177 -> 1.178) , xorg-driver-video-fglrx-desktop.patch (NONE -> 1.1) (NEW), xorg-driver-video-fglrx.desktop (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.177 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.178 --- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.177 Sat Jul 17 16:17:49 2010 +++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Sat Jul 17 16:28:29 2010 @@ -40,11 +40,11 @@ Group: X11 Source0: http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%(echo %{version} | tr . -)-x86.x86_64.run # Source0-md5: 089967a9aa86ad596884d82bb0b3a382 -Source1: %{pname}.desktop Patch0: %{pname}-kh.patch Patch1: %{pname}-smp.patch Patch2: %{pname}-x86genericarch.patch Patch3: fglrx-2.6.34-rc4.patch +Patch4: %{pname}-desktop.patch URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html %{?with_userspace:BuildRequires: OpenGL-GLU-devel} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} @@ -166,14 +166,13 @@ cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod -cd common %if %{with dist_kernel} -%patch0 -p2 +%patch0 -p1 %patch1 -p0 %patch2 -p0 %endif -%patch3 -p2 -cd - +%patch3 -p1 +%patch4 -p1 install -d common%{_prefix}/{%{_lib},bin,sbin} cp -r %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir} @@ -212,9 +211,10 @@ cp -r common%{_sysconfdir}/ati/atiogl.xml $RPM_BUILD_ROOT%{_sysconfdir}/ati/atiogl.xml cp -r common%{_datadir}/ati/* $RPM_BUILD_ROOT%{_datadir}/ati -cp -r %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} cp -r common%{_datadir}/icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir} +cp -r common%{_desktopdir}/*.desktop $RPM_BUILD_ROOT%{_desktopdir} + %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ld.so.conf.d,%{_libdir}/fglrx} @@ -358,6 +358,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.178 2010/07/17 14:28:29 baggins +- use bundled desktop files +- fix patches to avoid descending into subdirectories for patching + Revision 1.177 2010/07/17 14:17:49 baggins - rel 1.1 ================================================================ Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-desktop.patch diff -u /dev/null packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-desktop.patch:1.1 --- /dev/null Sat Jul 17 16:28:35 2010 +++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-desktop.patch Sat Jul 17 16:28:29 2010 @@ -0,0 +1,28 @@ +--- xorg-driver-video-fglrx-10.6/common/usr/share/applications/amdcccle.desktop~ 2010-06-03 16:23:55.000000000 +0200 ++++ xorg-driver-video-fglrx-10.6/common/usr/share/applications/amdcccle.desktop 2010-07-17 16:11:07.402132883 +0200 +@@ -3,9 +3,8 @@ + Type=Application + Exec=amdcccle + Icon=ccc_large +-Categories=GNOME;KDE;Qt;HardwareSettings;Settings; +- +- ++Terminal=false ++Categories=Qt;HardwareSettings;Settings; + Name=ATI Catalyst Control Center + Comment=Allows the configuration of the ATI graphics hardware settings. + Name[cs]=ATI Catalyst Control Center +--- xorg-driver-video-fglrx-10.6/common/usr/share/applications/amdccclesu.desktop~ 2010-06-03 16:23:55.000000000 +0200 ++++ xorg-driver-video-fglrx-10.6/common/usr/share/applications/amdccclesu.desktop 2010-07-17 16:11:32.434382244 +0200 +@@ -2,9 +2,9 @@ + Encoding=UTF-8 + Type=Application + Exec=amdxdg-su -c amdcccle +-Categories=GNOME;KDE;Qt;HardwareSettings;Settings; ++Categories=Qt;HardwareSettings;Settings; + Icon=ccc_large +- ++Terminal=false + Name=ATI Catalyst Control Center (Administrative) + Comment=Allows the configuration of the ATI graphics hardware settings that requires administrative access. + Name[cs]=ATI Catalyst Control Center (správce) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.177&r2=1.178&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
