rpms/blender/devel blender.spec,1.92,1.93

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26649

Modified Files:
	blender.spec 
Log Message:
* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-6
- Use proper compiler flags (see #199418)
- Minor grammar & language fixes and tidy-ups



Index: blender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blender/devel/blender.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- blender.spec	1 Dec 2008 05:03:44 -0000	1.92
+++ blender.spec	27 Dec 2008 08:38:33 -0000	1.93
@@ -3,15 +3,15 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.blender.org
-# During a Legel issue (#239476) the package contains a cusromized
-# source package created as fellow.
+# This is a customized source package without ffmpeg, which is
+# patent encumbered (#239476)
 # wget http://download.blender.org/source/blender-2.48.tar.gz
 # cd blender-2-47/extern
 # rm -rf ffmpeg libmp3lame
@@ -70,8 +70,7 @@
 Professionals and novices can easily and inexpensively publish stand-alone,
 secure, multi-platform content to the web, CD-ROMs, and other media.
 
-This version doesn't contains ffmpeg support, so that any features may be not
-available.
+This version doesn't contains ffmpeg support.
 
 %prep
 %setup -q 
@@ -87,12 +86,7 @@
 	 <%{SOURCE7} >user-config.py
 
 %build
-
-#
-# Don't use $RPM_OPT_FLAGS (see #199418)
-#
-
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0 {CFLAGS,CXXFLAGS}='%{optflags}'
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -152,7 +146,6 @@
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
   %{SOURCE4}
 
 #
@@ -187,6 +180,10 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-6
+- Use proper compiler flags (see #199418)
+- Minor grammar & language fixes and tidy-ups
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.48a-5
 - Rebuild for Python 2.6