rpms/nvidia-xconfig/F-12 .cvsignore, 1.3, 1.4 nvidia-xconfig.spec, 1.2, 1.3 sources, 1.3, 1.4

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-xconfig/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29365/F-12

Modified Files:
	.cvsignore nvidia-xconfig.spec sources 
Log Message:
Update to lastest



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2010 19:34:41 -0000	1.3
+++ .cvsignore	10 Jul 2010 15:44:18 -0000	1.4
@@ -1 +1 @@
-nvidia-xconfig-195.36.08.tar.bz2
+nvidia-xconfig-256.35.tar.bz2


Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/nvidia-xconfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-xconfig.spec	28 Feb 2010 19:34:41 -0000	1.2
+++ nvidia-xconfig.spec	10 Jul 2010 15:44:18 -0000	1.3
@@ -1,14 +1,14 @@
-%global iversion         195.36.08
+%global nversion         256.35
 
 Name:           nvidia-xconfig
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NVIDIA X configuration file editor
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/
-Source0:        http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xconfig-%{iversion}.tar.bz2
+Source0:        http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xconfig-%{nversion}.tar.bz2
 Patch0:         nvidia-xconfig-1.0-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,6 +21,7 @@
 %endif
 
 BuildRequires: m4
+Provides: %{name}-nversion = %{nversion}
 
 
 %description
@@ -29,18 +30,28 @@
 
 
 %prep
-%setup -q -n nvidia-xconfig-%{iversion}
-%patch0 -p1 -b .default
+%setup -q -n nvidia-xconfig-%{nversion}
+
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
 
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -IXF86Config-parser" NVDEBUG=1
+make  \
+  NVDEBUG=1 \
+  NV_VERBOSE=1 \
+  X_LDFLAGS="-L%{_libdir}" \
+  CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+#We usually have it in sbin
+mv $RPM_BUILD_ROOT%{_bindir}/nvidia-xconfig \
+  $RPM_BUILD_ROOT%{_sbindir}
+rmdir $RPM_BUILD_ROOT%{_bindir}
 
 
 
@@ -55,6 +66,10 @@
 %{_mandir}/man1/nvidia-xconfig.1.*
 
 %changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.0-3
+- Update internal version to 256.35
+- Provides %%{name}-nversion
+
 * Sun Feb 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-2
 - Update internal version to 195.36.08
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2010 19:34:41 -0000	1.3
+++ sources	10 Jul 2010 15:44:18 -0000	1.4
@@ -1 +1 @@
-fa58dcfd2a7edaee64467d15bc4679a3  nvidia-xconfig-195.36.08.tar.bz2
+8760a56f782872f5e06190c6737f76a3  nvidia-xconfig-256.35.tar.bz2