Author: glen Date: Wed Oct 29 12:25:00 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - fix build without all bindings
---- Files affected: SPECS: flixengine.spec (1.68 -> 1.69) ---- Diffs: ================================================================ Index: SPECS/flixengine.spec diff -u SPECS/flixengine.spec:1.68 SPECS/flixengine.spec:1.69 --- SPECS/flixengine.spec:1.68 Wed Oct 29 12:49:42 2008 +++ SPECS/flixengine.spec Wed Oct 29 13:24:54 2008 @@ -27,7 +27,7 @@ Summary(pl.UTF-8): Silnik On2 Flix Name: flixengine Version: 8.0.13.0 -Release: 0.3 +Release: 0.4 License: (probably) not distributable Group: Applications # download demo from http://flix.on2.com/demos/ @@ -275,11 +275,11 @@ # and somewhy --no-compile didn not work, had to specify also --no-modules, # which made no modules installed either, chicken-egg problem. s,COMPILEMODULES=y,COMPILEMODULES=n, -s,^INSTALLEDPERLFILES=.*,INSTALLEDPERLFILES="y", -s,^INSTALLEDPHPFILES=.*,INSTALLEDPHPFILES="y", -s,^INSTALLEDPYTHONFILES=.*,INSTALLEDPYTHONFILES="y", s,^INSTALLEDFLIXLIBRARIES=.*,INSTALLEDFLIXLIBRARIES="y", -s,^INSTALLEDJAVAFILES=.*,INSTALLEDJAVAFILES="y", +%{?with_perl:"s,^INSTALLEDPERLFILES=.*,INSTALLEDPERLFILES="y",} +%{?with_php:s,^INSTALLEDPHPFILES=.*,INSTALLEDPHPFILES="y",} +%{?with_python:s,^INSTALLEDPYTHONFILES=.*,INSTALLEDPYTHONFILES="y",} +%{?with_java:s,^INSTALLEDJAVAFILES=.*,INSTALLEDJAVAFILES="y",} ' install.sh @@ -368,8 +368,13 @@ cd .flix-engine-installation-files install lget on2_host_info $RPM_BUILD_ROOT%{_sbindir} -# symlink without buildroot -ln -snf %{_docdir}/on2/flixengine/html/c/cli.html $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c/README-cli.html +# symlink outside package, install apidoc to read all docs +rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c/README-cli.html +rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/perl/README-{cgi,cli}.html +rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/php/README-{cgi,cli}.html +rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/python/README-{cgi,cli}.html +rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/java/README-cli.html +rm -f $RPM_BUILD_ROOT%{_docdir}/on2/flixengine/javadoc # install bindings %if %{with php} @@ -384,8 +389,6 @@ ;extension=flixengine2.so EOF -# symlink outside package, install apidoc package to read all docs -rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/php/README-{cgi,cli}.html # per package dirs mv $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version}/php,php-%{name}-%{version}} %endif @@ -396,8 +399,6 @@ DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/On2/flixengine2/.packlist cd .. -# symlink outside package, install apidoc package to read all docs -rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/perl/README-{cgi,cli}.html # per package dirs mv $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version}/perl,perl-%{name}-%{version}} %endif @@ -409,8 +410,6 @@ --root=$RPM_BUILD_ROOT %py_postclean cd .. -# symlink outside package, install apidoc to read all docs -rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/python/README-{cgi,cli}.html # per package dirs mv $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version}/python,python-%{name}-%{version}} %endif @@ -422,9 +421,6 @@ install \ -f target.mk -# symlink outside package, install apidoc to read all docs -rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/java/README-cli.html -rm -f $RPM_BUILD_ROOT%{_docdir}/on2/flixengine/javadoc # per package dirs mv $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version}/java,java-%{name}-%{version}} %endif @@ -644,6 +640,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.69 2008/10/29 12:24:54 glen +- fix build without all bindings + Revision 1.68 2008/10/29 11:49:42 glen - enable all bindings - package examples in own topdir for each binding ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/flixengine.spec?r1=1.68&r2=1.69&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
