rpms/Cg/devel .cvsignore,1.4,1.5 Cg.spec,1.5,1.6 sources,1.4,1.5

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/Cg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16624/devel

Modified Files:
	.cvsignore Cg.spec sources 
Log Message:
Update to April2009



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Mar 2009 18:14:29 -0000	1.4
+++ .cvsignore	12 May 2009 15:05:38 -0000	1.5
@@ -1,2 +1,2 @@
-Cg-2.1_February2009_x86_64.tgz
-Cg-2.1_February2009_x86.tgz
+Cg-2.2_April2009_x86.tgz
+Cg-2.2_April2009_x86_64.tgz


Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/Cg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Cg.spec	27 Mar 2009 18:19:31 -0000	1.5
+++ Cg.spec	12 May 2009 15:05:38 -0000	1.6
@@ -1,6 +1,6 @@
-%define maj_version 2.1
-%define min_version 0017
-%define date February2009
+%define maj_version 2.2
+%define min_version 0006
+%define date April2009
 
 # No debuginfo
 %define debug_package %{nil}
@@ -19,9 +19,9 @@
 Release: 1%{?dist}
 URL: http://developer.nvidia.com/object/cg_toolkit.html
 Group: Development/Languages
-Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%{maj_version}_%{date}_x86.tgz
-Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%{maj_version}_%{date}_x86_64.tgz
-License: Redistributable, no modification permitted
+Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_version}_%{date}_x86.tgz
+Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_version}_%{date}_x86_64.tgz
+License: Redistributable, no modification permitted and MIT
 %if 0%{?fedora} >= 11
 ExclusiveArch: i586 x86_64
 %else
@@ -30,6 +30,11 @@
 Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  freeglut-devel
+BuildRequires:  glew-devel >= 1.5.1
+BuildRequires:  libXi-devel
+BuildRequires:  libXmu-devel
+
 Requires(post): /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
 
@@ -66,10 +71,27 @@
 %setup -q -c %{name}-%{version} -D -T -a 1
 %endif
 
+#Remove binary bundled tools
+rm usr/bin/{cginfo,cgfxcat}
+
 
 %build
 # Nothing to build
-echo "Nothing to build"
+echo "Nothing to build,... Well not exactly"
+
+for b in cgfxcat cginfo ; do
+    make -C usr/local/Cg/examples/Tools/${b} clean
+    sed -i -e 's/-DGLEW_STATIC//' usr/local/Cg/examples/Tools/${b}/Makefile
+    sed -i -e 's/-Wall/%{optflags}/' usr/local/Cg/examples/Tools/${b}/Makefile
+    make -C usr/local/Cg/examples/Tools/${b} \
+    GLEW=%{_prefix} \
+    CG_INC_PATH=%{_builddir}/%{buildsubdir}/usr/include \
+    CG_LIB_PATH=%{_builddir}/%{buildsubdir}/%{_libdir}
+    mv usr/local/Cg/examples/Tools/${b}/${b} usr/bin
+    strip usr/bin/${b}
+    make -C usr/local/Cg/examples/Tools/${b} clean
+done
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +106,7 @@
 # Owernship of the alternative provides
 touch $RPM_BUILD_ROOT%{_bindir}/cgc
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,10 +123,15 @@
 %postun -n libCg -p /sbin/ldconfig
 
 %files
-%defattr(644,root,root,755)
+%defattr(755,root,root,755)
 %ghost %{_bindir}/cgc
-%attr(755,root,root) %{_bindir}/cgc-%{_lib}
+%{_bindir}/cgc-%{_lib}
+%{_bindir}/cgfxcat
+%{_bindir}/cginfo
+%defattr(644,root,root,755)
 %{_includedir}/Cg/
+%dir %{_mandir}/manCgFX
+%dir %{_mandir}/manCg
 %{_mandir}/man*/*
 
 %files docs
@@ -111,10 +139,14 @@
 %doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
 
 %files -n libCg
+%defattr(755,root,root,755)
 %{_libdir}/*.so
 
 
 %changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 2.2-1
+- Update to 2.2.0006 (April2009)
+
 * Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 2.1.0017-1
 - Update to 2.1.0017 (February2009)
 - Re-introduce disttag


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Mar 2009 18:14:29 -0000	1.4
+++ sources	12 May 2009 15:05:38 -0000	1.5
@@ -1,2 +1,2 @@
-01a3d1e0936c3f221ede5b6bfd8d2e0c  Cg-2.1_February2009_x86_64.tgz
-8752286743ddd9d5997e698714fcc556  Cg-2.1_February2009_x86.tgz
+acb2a5e6b2b05f04be3b37cb758ae002  Cg-2.2_April2009_x86.tgz
+59b487d2d729d34e0696bb967f250409  Cg-2.2_April2009_x86_64.tgz