openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package cg (Revision cf537116bdcbc57de123ee6cec518012)

Currently displaying revision cf537116bdcbc57de123ee6cec518012 , Show latest

--- cg.changes.orig
+++ cg.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Apr 29 09:13:29 UTC 2010 - mhopf@novell.com
+
+- Fix dependency by rebuilding cgfxcat (bnvc #548246).
+  Won't be necessary with next code drop from NVidia.
+
+-------------------------------------------------------------------
 Mon Apr 26 13:44:57 UTC 2010 - mhopf@novell.com
 
 - Update to 2.2 version of February2010
--- cg.spec.orig
+++ cg.spec
@@ -21,7 +21,7 @@ Name:           cg
 Url:            http://developer.nvidia.com/object/cg_toolkit.html
 License:        PERMISSIVE-OSI-COMPLIANT
 Group:          Development/Tools/Other
-BuildRequires:  fdupes
+BuildRequires:  fdupes freeglut-devel
 AutoReqProv:    on
 Version:        2.2
 Release:        3
@@ -31,13 +31,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExclusiveArch:  %ix86 x86_64
 Obsoletes:      Cg <= %{version}
 Provides:       Cg = %{version}
-Requires:       Mesa-devel
 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}
+# # 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
 %if "%_arch" == "i386"
 %define CgArch x86
 %else
@@ -64,6 +65,7 @@ License:        NON-OSI-COMPLIANT(royalt
 Summary:        Development documentation and examples for the Cg graphics language
 Group:          Development/Tools/Other
 Requires:       %name = %version
+Requires:       Mesa-devel
 Obsoletes:      Cg-devel <= %{version}
 Provides:       Cg-devel = %{version}
 AutoReqProv:    on
@@ -86,11 +88,15 @@ Authors:
     NVIDIA
 
 %prep
-rm -rf %_builddir/*
 %setup -q -n . -D -T
 tar -xf %_sourcedir/Cg-%{fileversion}_%CgArch.tar.bz2
 
 %build
+cp -a usr/local/Cg/examples/Tools/cgfxcat cgfxcat
+cd cgfxcat
+make CFLAGS="$RPM_OPT_FLAGS -I../usr/include -I../usr/local/Cg/examples/OpenGL/glew/include -L../usr/lib64 -L../usr/lib"
+cd -
+cp cgfxcat/cgfxcat usr/bin/
 
 %install
 mkdir -p %buildroot/usr %buildroot%_defaultdocdir/%name/docs

Places

File project.diff of Package cg (Revision cf537116bdcbc57de123ee6cec518012)

Places