Author: glen Date: Wed Jun 13 16:57:16 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- support for non-demo tarball
---- Files affected:
SPECS:
flixengine.spec (1.40 -> 1.41)
---- Diffs:
================================================================
Index: SPECS/flixengine.spec
diff -u SPECS/flixengine.spec:1.40 SPECS/flixengine.spec:1.41
--- SPECS/flixengine.spec:1.40 Fri May 25 16:00:13 2007
+++ SPECS/flixengine.spec Wed Jun 13 18:57:11 2007
@@ -5,6 +5,7 @@
%bcond_without python # do not build Python bindings
%bcond_without java # do not build Java bindings
%bcond_with tests # perform "make test". needs running flixd on
localhost
+%bcond_without demo # use production tarball (you need one too:))
#
%ifarch %{x8664}
%undefine with_python
@@ -16,16 +17,23 @@
Summary(pl.UTF-8): Silnik On2 Flix
Name: flixengine
Version: 8.0.8.2
-Release: 0.6
+Release: 0.7
License: (probably) not distributable
Group: Applications
# download demo from http://flix.on2.com/demos/
# check for newer versions at http://flix.on2.com/download
# Source0Download: http://flix.on2.com/demos/flixenginelinuxdemo.tar.gz
+%if %{with demo}
Source0: %{name}linuxdemo-%{version}.tar.gz
# NoSource0-md5: 4784ed913f6193766930248bb4dbea3d
NoSource: 0
-Source1: %{name}.init
+%endif
+%if %{without demo}
+Source1: flix-engine-installer-linux-%{version}.tar.gz
+# NoSource0-md5: 4784ed913f6193766930248bb4dbea3d
+NoSource: 1
+%endif
+Source2: %{name}.init
Patch0: %{name}-libdir.patch
Patch1: %{name}-phploader.patch
URL: http://www.on2.com/developer/flix-engine-sdk
@@ -181,9 +189,9 @@
Dokumentacja HTML API dla silnika On2 Flix.
%prep
-%setup -q -n flix-engine-installer-linux-%{version}_DEMO
-bin=flix-engine-installer-linux-%{version}_DEMO.bin
-tar=flix-engine-linux-%{version}_DEMO.tar.gz
+%setup -q -T -b %{?with_demo:0}%{!?with_demo:1 -n
flix-engine-installer-linux-%{version}}
+bin=flix-engine-installer-linux-%{version}%{?with_demo:_DEMO}.bin
+tar=flix-engine-linux-%{version}%{?with_demo:_DEMO}.tar.gz
OFFSET=$( awk -F= '/OFFSET=/{print $2; exit}' $bin)
dd bs=8 if=$bin of=$tar skip=$OFFSET
@@ -195,10 +203,10 @@
%{__sed} -ne '/## FUNCTIONS common/,/## END - common function/p' $bin >
functions.sh
cat <<'EOF' > install.sh
#!/bin/bash
-export VERSION=%{version}_DEMO
-export FLIXENGINEDEMO=1
+export VERSION=%{version}%{?with_demo:_DEMO}
+%{?with_demo:export FLIXENGINEDEMO=1}
export nullout=/dev/null
-export tempdir=%{_builddir}/flix-engine-installer-linux-%{version}_DEMO
+export
tempdir=%{_builddir}/flix-engine-installer-linux-%{version}%{?with_demo:_DEMO}
. $(dirname "$0")/functions.sh
cd .flix-engine-installation-files
@@ -292,7 +300,7 @@
--no-init \
--noprereqlibs
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/flixd
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/flixd
cd .flix-engine-installation-files
@@ -386,7 +394,7 @@
#!/bin/sh
. %{_sysconfdir}/flixd-license.conf
-%{_sbindir}/lget -u "$FLIX_USERNAME" -s "$FLIX_SERIAL" -i
%{_sysconfdir}/hostinfo -o %{_sysconfdir}/flixengine.lic -a
'On2FlixEngine/%{version}_DEMO (%(uname -o))'
+%{_sbindir}/lget -u "$FLIX_USERNAME" -s "$FLIX_SERIAL" -i
%{_sysconfdir}/hostinfo -o %{_sysconfdir}/flixengine.lic -a
'On2FlixEngine/%{version}%{?with_demo:_DEMO} (%(uname -o))'
EOF
%clean
@@ -523,6 +531,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2007/06/13 16:57:11 glen
+- support for non-demo tarball
+
Revision 1.40 2007/05/25 14:00:13 glen
- ldconfig
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.40&r2=1.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
