rpms/Cg/F-10 .cvsignore,1.2,1.3 Cg.spec,1.1,1.2 sources,1.2,1.3

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/Cg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16815/F-10

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



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2008 19:40:37 -0000	1.2
+++ .cvsignore	12 May 2009 15:06:31 -0000	1.3
@@ -1,2 +1,2 @@
-Cg-2.0_May2008_x86_64.tgz
-Cg-2.0_May2008_x86.tgz
+Cg-2.2_April2009_x86.tgz
+Cg-2.2_April2009_x86_64.tgz


Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/Cg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cg.spec	4 Aug 2008 19:40:37 -0000	1.1
+++ Cg.spec	12 May 2009 15:06:31 -0000	1.2
@@ -1,9 +1,11 @@
-%define maj_version 2.0
-%define min_version 0015
-%define date May2008
+%define maj_version 2.2
+%define min_version 0006
+%define date April2009
 
 # No debuginfo
 %define debug_package %{nil}
+# Disable strip
+%define __strip /bin/true
 
 %ifarch x86_64
 %define priority 10
@@ -14,16 +16,25 @@
 Summary: NVIDIA Cg Toolkit
 Name: Cg
 Version: %{maj_version}.%{min_version}
-Release: 2
+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
 ExclusiveArch: i386 x86_64
+%endif
 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
 
@@ -35,6 +46,8 @@
 20 different OpenGL and DirectX profile targets, Cg will allow you to
 incorporate stunning interactive effects into your 3D applications.
 
+This is the %{date} release
+
 %package docs
 Summary: NVIDIA Cg Toolkit documentation
 Group: Documentation
@@ -51,22 +64,34 @@
 This package contains Cg shared support library.
 
 %prep
-%ifarch i386
+%ifarch %{ix86}
 %setup -q -c %{name}-%{version}
 %endif
 %ifarch x86_64
 %setup -q -c %{name}-%{version} -D -T -a 1
 %endif
 
-# 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
+#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
@@ -81,6 +106,7 @@
 # Owernship of the alternative provides
 touch $RPM_BUILD_ROOT%{_bindir}/cgc
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,11 +123,15 @@
 %postun -n libCg -p /sbin/ldconfig
 
 %files
-%defattr(644,root,root,755)
-%doc usr/local/Cg/docs/Cg_Redist_License.pdf
+%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
@@ -109,12 +139,22 @@
 %doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
 
 %files -n libCg
+%defattr(755,root,root,755)
 %{_libdir}/*.so
 
 
 %changelog
-* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.0015-2
-- rebuild
+* 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
+- Disable strip
+- Fix some conditionnals
+
+* Fri Jan  9 2009 kwizart < kwizart at gmail.com > - 2.1.0016-1
+- Update to 2.1.0016 (November2008)
 
 * Sun May 18 2008 kwizart < kwizart at gmail.com > - 2.0.0015-1
 - Update to 2.0.0015 (May2008)


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2008 19:40:37 -0000	1.2
+++ sources	12 May 2009 15:06:31 -0000	1.3
@@ -1,2 +1,2 @@
-f0923e9fe9c0e0f1b1f49e9069c59815  Cg-2.0_May2008_x86_64.tgz
-311069e73186b3a7837d35df08b714c8  Cg-2.0_May2008_x86.tgz
+acb2a5e6b2b05f04be3b37cb758ae002  Cg-2.2_April2009_x86.tgz
+59b487d2d729d34e0696bb967f250409  Cg-2.2_April2009_x86_64.tgz