Unnamed

Index: xorg-x11-drv-nvidia-legacy.spec
===================================================================
--- xorg-x11-drv-nvidia-legacy.spec	(révision 13929)
+++ xorg-x11-drv-nvidia-legacy.spec	(copie de travail)
@@ -1,12 +1,14 @@
 %define        nvidialibdir      %{_libdir}/nvidia
-# Build ID workaround - No debug though :(
+
+# Tweak to have debuginfo - part 1/2
 %if "%fedora" > "7"
-%define debug_package %{nil}
+%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%{nil}
 %endif
 
 Name:          xorg-x11-drv-nvidia-legacy
 Version:       71.86.04
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       NVIDIA's legacy proprietary display driver for NVIDIA graphic cards
 
 Group:         User Interface/X Hardware Support
@@ -40,7 +42,9 @@
 Requires:           %{name}-libs = %{version}-%{release}
 # to prevent i386 package being pulled first and x86_64 package being excluded
 # on x86_64 systems
+%ifarch x86_64
 Requires:           %{nvidialibdir}/libGL.so.%{version}
+%endif
 Requires(post):     livna-config-display
 Requires(preun):    livna-config-display
 Requires(post):     chkconfig
@@ -66,7 +70,7 @@
 %package devel
 Summary:       Development files for %{name}
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 This package provides the development files of the %{name} package,
@@ -91,6 +95,12 @@
 sh %{SOURCE1} --extract-only --target nvidiapkg-x64
 tar -cjf nvidia-glx-legacy-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
 
+# Tweak to have debuginfo - part 2/2
+%if "%fedora" > "7"
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
+
 %ifarch %{ix86}
 ln -s nvidiapkg-x86 nvidiapkg
 %else
@@ -101,8 +111,12 @@
 cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
 find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
 
+
 %build
+# Nothing to build
+echo "Nothing to build"
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -193,10 +207,6 @@
 # Change perms on static libs. Can't fathom how to do it nicely above.
 find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
 
-# We need to strip binaries and libs even if no debuginfo is made 
-%if "%fedora" > "7"
-find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.so*" -exec strip '{}' \;
-%endif
 
 
 %clean
@@ -279,6 +289,11 @@
 
 
 %changelog
+* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 71.86.04-3
+- Fix debuginfo package creation.
+- Add libGLcore.so.1 to the filter list.
+- Only requires versioned libGL on x86_64 (no problem on x86).
+
 * Thu Feb 7 2008 Stewart Adam <s.adam AT diffingo DOT com> - 71.86.04-2
 - Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs
 
Index: filter-requires.sh
===================================================================
--- filter-requires.sh	(révision 13929)
+++ filter-requires.sh	(copie de travail)
@@ -6,5 +6,5 @@
    FINDREQ=/usr/lib/rpm/find-requires
 fi
 
-$FINDREQ $* | sed -e '/libnvidia-tls.so/d'
+$FINDREQ $* | sed -e '/libnvidia-tls.so/,/libGLcore.so/d'