- rel. 2

- now fireglcontrol is compiled not just copied
- remove QWindowsStyle from fireglcontrol

Changed files:
    X11-driver-firegl.spec -> 1.7

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index dad1f4197359c1e45d0f94cfc6443ea06c4b722f..3740c89d8527aa8074e417d60b89d931048bc260 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -9,13 +9,14 @@ Summary:      Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          XFree86-driver-firegl
 Version:       2.9.8
-Release:       1
+Release:       2
 License:       ATI Binary
 Vendor:                ATI
 Group:         X11/XFree86
 URL:           http://www.ati.com/support/drivers/linux/radeon-linux.html
 #Source0:      http://pdownload.mii.instacontent.net/ati/drivers/fglrx-glc22-4.2.0-%{version}.i586.rpm
 Source0:       http://www.schneider-digital.de/download/ati/glx1_linux_X4.3.zip
+Patch0:                firegl-panel.patch
 BuildRequires: cpio
 %{!?_without_dist_kernel:BuildRequires:         kernel-headers >= 2.2.0 }
 BuildRequires: rpm-utils
@@ -69,6 +70,9 @@ unzip %{SOURCE0}
 mv Xfree4.3.0_2.9.08/* .
 rpm2cpio fglrx-glc22-4.3.0-%{version}.i586.rpm | cpio -i -d
 bzip2 -d -v usr/X11R6/bin/*.bz2
+mkdir panel_src
+tar -xzf usr/src/fglrx_panel_sources.tgz -C panel_src
+%patch0 -p1
 
 %build
 cd lib/modules/fglrx/build_mod/
@@ -76,6 +80,9 @@ cp make.sh make.sh.org && rm -f make.sh
 sed -e 's#gcc#%{kgcc}#g' -e 's#`id -u` -ne 0#`id -u` -ne `id -u`#g' make.sh.org > make.sh
 chmod 755 make.sh
 ./make.sh
+cd ../../../../panel_src
+%{__make} MK_QTDIR=/usr \
+       LIBQT_DYN=qt-mt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +91,8 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/
 
 install lib/modules/fglrx/build_mod/fglrx.o            $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/
 
-install usr/X11R6/bin/{fgl_glxgears,fglrxconfig,fglrxinfo,fireglcontrol.qt3.gcc3.2} $RPM_BUILD_ROOT%{_bindir}
+install usr/X11R6/bin/{fgl_glxgears,fglrxconfig,fglrxinfo} $RPM_BUILD_ROOT%{_bindir}
+install panel_src/{fireglcontrol.qt3.gcc3.2.3,fireglcontrol} $RPM_BUILD_ROOT%{_bindir}
 cp -r usr/X11R6/lib/* $RPM_BUILD_ROOT%{_libdir}/
 
 cd $RPM_BUILD_ROOT%{_libdir}