Author: sparky                       Date: Tue Jan 31 14:33:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pass CC, CFLAGS
- BRs

---- Files affected:
SPECS:
   nvidia-settings.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/nvidia-settings.spec
diff -u SPECS/nvidia-settings.spec:1.3 SPECS/nvidia-settings.spec:1.4
--- SPECS/nvidia-settings.spec:1.3      Tue Jan 31 13:38:03 2006
+++ SPECS/nvidia-settings.spec  Tue Jan 31 15:33:40 2006
@@ -15,16 +15,10 @@
 Patch0:                libXNVCtrl-shared.patch
 Patch1:                %{name}-xlibs.patch
 URL:           ftp://download.nvidia.com/XFree86/nvidia-settings/
+BuildRequires: XFree86-devel
 %if %{with nvidia_settings}
-#BuildRequires:        XFree86-devel
-#BuildRequires:        XFree86-libs
-#BuildRequires:        fontconfig
-#BuildRequires:        freetype2
-#BuildRequires:        glib2-devel
-#BuildRequires:        libatk-devel
-#BuildRequires:        libgtk+2-devel
-#BuildRequires:        libpango-devel
-#BuildRequires:        pkgconfig
+BuildRequires: gtk+2-devel
+BuildRequires: pkgconfig
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,14 +101,17 @@
 cd src/libXNVCtrl
 xmkmf
 %{__make} clean
-%{__make}
+%{__make} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 cd ../..
 %endif
 
 %if %{with nvidia_settings}
 %{__make} \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags}"
 %endif
 
 %install
@@ -165,6 +162,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/01/31 14:33:40  sparky
+- pass CC, CFLAGS
+- BRs
+
 Revision 1.3  2006/01/31 12:38:03  qboosh
 - pl, no "prefix" in /usr/X11R6 paths
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nvidia-settings.spec?r1=1.3&r2=1.4&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to