openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package cg (Revision f6f6fcea444fc290268460b35fa099ea)

Currently displaying revision f6f6fcea444fc290268460b35fa099ea , Show latest

--- cg.changes.orig
+++ cg.changes
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Thu Oct 11 13:54:50 UTC 2012 - cfarrell@suse.com
+
+- license update: SUSE-NonFree and GPL-2.0+
+  There are GPL-2.0+ licensed files in the examples subdirectory
+
+-------------------------------------------------------------------
+Tue Oct  9 00:48:42 UTC 2012 - mailaender@opensuse.org
+
+- Update to 3.1.0013 of April 2012
+
+  * Improved GLSL support for clip semantics.
+  * Fixed a runtime bug concerning gp4 and gp5 geometry programs.
+
+-------------------------------------------------------------------
 Sat May 29 12:17:47 UTC 2010 - cmorve69@yahoo.es
 
 - Don't include examples since they are wrongly linked
--- cg.spec.orig
+++ cg.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package cg (Version 2.2)
+# spec file for package cg (Version 3.1)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,27 +18,22 @@
 
 
 Name:           cg
-Url:            http://developer.nvidia.com/object/cg_toolkit.html
-License:        PERMISSIVE-OSI-COMPLIANT
+Url:            http://developer.nvidia.com/cg-toolkit
+License:        SUSE-NonFree and GPL-2.0+
 Group:          Development/Tools/Other
-BuildRequires:  fdupes freeglut-devel
+BuildRequires:  fdupes
+BuildRequires:  freeglut-devel
 AutoReqProv:    on
-Version:        2.2
-Release:        5
-%define fileversion 2.2_February2010
-Summary:        Compiler and Runtime Libraries for the Cg Graphics Language
+Version:        3.1.0013
+Release:        1
+%define fileversion 3.1_April2012
+Summary:        C for Graphics
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64
-Obsoletes:      Cg <= %{version}
+Obsoletes:      Cg < %{version}
 Provides:       Cg = %{version}
-Source:         Cg-%{fileversion}_x86.tar.bz2
-Source1:        Cg-%{fileversion}_x86_64.tar.bz2
-# Source100:      filter-requires.sh
-# # Workaround for ELF files linked against libGLU.so, without versioning. Remove once nvidia fixes it.
-# %%global _use_internal_dependency_generator 0
-# %%global __find_requires /bin/sh %{S:100}
-# # script contents: /usr/lib/rpm/find-requires | sed '/libGLU\.so/d'
-# # Fixed now by rebuilding cgfxcat
+Source:         Cg-%{fileversion}_x86.tgz
+Source1:        Cg-%{fileversion}_x86_64.tgz
 %if "%_arch" == "i386"
 %define CgArch x86
 %else
@@ -61,12 +56,12 @@ Authors:
     NVIDIA
 
 %package devel
-License:        NON-OSI-COMPLIANT(royalties)
-Summary:        Development documentation and examples for the Cg graphics language
+License:        SUSE-NonFree and GPL-2.0+
+Summary:        Development documentation and examples for C for Graphics
 Group:          Development/Tools/Other
 Requires:       %name = %version
 Requires:       Mesa-devel
-Obsoletes:      Cg-devel <= %{version}
+Obsoletes:      Cg-devel < %{version}
 Provides:       Cg-devel = %{version}
 AutoReqProv:    on
 
@@ -89,7 +84,7 @@ Authors:
 
 %prep
 %setup -q -n . -D -T
-tar -xf %_sourcedir/Cg-%{fileversion}_%CgArch.tar.bz2
+tar -xf %_sourcedir/Cg-%{fileversion}_%CgArch.tgz
 
 %build
 cp -a usr/local/Cg/examples/Tools/cgfxcat cgfxcat
@@ -100,15 +95,10 @@ cp cgfxcat/cgfxcat usr/bin/
 
 %install
 mkdir -p %buildroot/usr %buildroot%_defaultdocdir/%name/docs
-cp -a usr/bin usr/%_lib usr/include usr/share %buildroot/usr/
+cp -a usr/bin usr/%_lib usr/include %buildroot/usr/
 cp -a usr/local/Cg/. %buildroot%_defaultdocdir/%name/
 mkdir -p %buildroot/usr/lib/%name
-# Commented as a workaround for ELF files linked against libGLU.so, without versioning. Remove once nvidia fixes it.
-#mv %buildroot%_defaultdocdir/%name/examples %buildroot/usr/lib/%name/
-rm -R %buildroot%_defaultdocdir/%name/examples
-rm %buildroot%_defaultdocdir/%name/include/GL/glext.h
-rm %buildroot%_defaultdocdir/%name/docs/CgReferenceManual.chm
-rmdir %buildroot%_defaultdocdir/%name/include/GL %buildroot%_defaultdocdir/%name/include
+mv %buildroot%_defaultdocdir/%name/examples %buildroot/usr/lib/%name/
 sed -i "s@/usr/local/Cg@%_defaultdocdir/cg@g" %buildroot%_defaultdocdir/%name/README
 sed -i "s@/usr/local/Cg@%_defaultdocdir/cg@g" %buildroot%_defaultdocdir/%name/MANIFEST
 %fdupes %buildroot/usr/lib/cg/examples
@@ -132,17 +122,13 @@ sed -i "s@/usr/local/Cg@%_defaultdocdir/
 %defattr(-, root, root)
 %dir %_includedir/Cg
 %_includedir/Cg/*.h
-%_mandir/man3/*.3.gz
-%dir %_mandir/manCg
-%_mandir/manCg/*.Cg.gz
-%dir %_mandir/manCgFX
-%_mandir/manCgFX/*.CgFX.gz
 %_defaultdocdir/%name/docs/CgFX_bumpdemo_Tutorial.pdf
 %_defaultdocdir/%name/docs/CgReferenceManual.pdf
 %_defaultdocdir/%name/docs/CgReleaseNotes.pdf
 %_defaultdocdir/%name/docs/Cg_bumpdemo_Tutorial.pdf
+%_defaultdocdir/%name/docs/CgReferenceManual.chm
 %_defaultdocdir/%name/docs/html
 %dir /usr/lib/%name
-#/usr/lib/%name/examples
+/usr/lib/%name/examples
 
 %changelog

Places

File project.diff of Package cg (Revision f6f6fcea444fc290268460b35fa099ea)

Places