Author: wrobell Date: Fri Sep 29 01:25:43 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - ver. 2.42a - drop build config installed using SOURCE, just generate it on the fly (imho, much simpler) - above also fixes problem, when files are built in ~/rpm/BUILD instead of ~/rpm/BUILD/blender*
---- Files affected: SPECS: blender.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: SPECS/blender.spec diff -u SPECS/blender.spec:1.65 SPECS/blender.spec:1.66 --- SPECS/blender.spec:1.65 Wed Sep 13 12:10:10 2006 +++ SPECS/blender.spec Fri Sep 29 03:25:37 2006 @@ -7,15 +7,14 @@ Summary: 3D modeling, rendering, animation and game creation package Summary(pl): Pakiet do tworzenia animacji 3D oraz gier Name: blender -Version: 2.42 -Release: 0.2 +Version: 2.42a +Release: 0.1 License: GPL Group: X11/Applications/Graphics Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz -# Source0-md5: 232d714a64c3a2208f0ea999fe4a2440 +# Source0-md5: 3d60b7ebe0dea47da12744fe2462d96c Source1: %{name}.desktop Source2: %{name}.png -Source3: %{name}-config.opts Source4: %{name}-wrapper Source5: %{name}.manpage Patch0: %{name}-po_and_locale_names.patch @@ -59,29 +58,32 @@ 3D oraz gier, dostępny dla systemów Unix, Windows i BeOS. %prep -%setup -q -n %{name}%{version} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 mv -f po/pt_{br,BR}.po -install %{SOURCE3} config.opts %build rm -f missing +rm -f user-config.py RPMCFLAGS="\"`echo %{rpmcflags}|sed 's/ /\",\"/g'`\"" RPMLDFLAGS="\"`echo %{rpmldflags}|sed 's/ /\",\"/g'`\"" -sed -i -e "s|^CCFLAGS =.*|CCFLAGS = [$RPMCFLAGS]|" \ - -e "s|^CXXFLAGS =.*|CXXFLAGS = [$RPMCFLAGS]|" \ - -e "s|^LDFLAGS =.*|LDFLAGS = [$RPMLDFLAGS]|" \ - config.opts -sed -i -e "s|TARGET_CC =.*|TARGET_CC = '%{__cc}'|" \ - -e "s|TARGET_CXX =.*|TARGET_CXX = '%{__cxx}'|" \ - config.opts -sed -i 's/python2\.3/python%{py_ver}/' config.opts - -cp config.opts user-config.py +cat > user-config.py <<END +CCFLAGS = [$RPMCFLAGS] +CXXFLAGS = [$RPMCFLAGS] +LDFLAGS = [$RPMLDFLAGS] +TARGET_CC = '%{__cc}' +TARGET_CXX = '%{__cxx}' + +BF_PYTHON_VERSION = '2.5' + +LCGDIR = 'lib/linux2' +BF_BUILDDIR = 'build/linux2' +BF_INSTALLDIR = 'install/linux2' +END scons %{__make} -C po OCGDIR=.. @@ -93,11 +95,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir},%{_desktopdir},%{_pixmapsdir},%{_bindir}} +install -d $RPM_BUILD_ROOT{%{_datadir},%{_desktopdir},%{_pixmapsdir},%{_bindir}} \ + $RPM_BUILD_ROOT%{_datadir}/blender/bpydata -install blender $RPM_BUILD_ROOT%{_bindir}/blender-bin +install ./install/linux2/blender $RPM_BUILD_ROOT%{_bindir}/blender-bin install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/blender -install blenderplayer $RPM_BUILD_ROOT%{_bindir} +#install blenderplayer $RPM_BUILD_ROOT%{_bindir} install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} install -d $RPM_BUILD_ROOT%{_libdir}/blender/plugins/sequence @@ -133,6 +136,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.66 2006/09/29 01:25:37 wrobell +- ver. 2.42a +- drop build config installed using SOURCE, just generate it on the fly + (imho, much simpler) +- above also fixes problem, when files are built in ~/rpm/BUILD instead + of ~/rpm/BUILD/blender* + Revision 1.65 2006/09/13 10:10:10 cieciwa - added BR: OpenEXR-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/blender.spec?r1=1.65&r2=1.66&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
