SPECS: flixengine.spec - eh, simplify
glen
glen at pld-linux.org
Wed Jun 13 18:59:42 CEST 2007
Author: glen Date: Wed Jun 13 16:59:42 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- eh, simplify
---- Files affected:
SPECS:
flixengine.spec (1.41 -> 1.42)
---- Diffs:
================================================================
Index: SPECS/flixengine.spec
diff -u SPECS/flixengine.spec:1.41 SPECS/flixengine.spec:1.42
--- SPECS/flixengine.spec:1.41 Wed Jun 13 18:57:11 2007
+++ SPECS/flixengine.spec Wed Jun 13 18:59:37 2007
@@ -12,6 +12,8 @@
%undefine with_java
%endif
#
+%define full_version %{version}%{?with_demo:_DEMO}
+#
%include /usr/lib/rpm/macros.perl
Summary: On2 Flix Engine
Summary(pl.UTF-8): Silnik On2 Flix
@@ -189,9 +191,9 @@
Dokumentacja HTML API dla silnika On2 Flix.
%prep
-%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
+%setup -q -T -b %{?with_demo:0}%{!?with_demo:1} -n flix-engine-installer-linux-%{full_version}
+bin=flix-engine-installer-linux-%{full_version}.bin
+tar=flix-engine-linux-%{full_version}.tar.gz
OFFSET=$( awk -F= '/OFFSET=/{print $2; exit}' $bin)
dd bs=8 if=$bin of=$tar skip=$OFFSET
@@ -203,10 +205,10 @@
%{__sed} -ne '/## FUNCTIONS common/,/## END - common function/p' $bin > functions.sh
cat <<'EOF' > install.sh
#!/bin/bash
-export VERSION=%{version}%{?with_demo:_DEMO}
+export VERSION=%{full_version}
%{?with_demo:export FLIXENGINEDEMO=1}
export nullout=/dev/null
-export tempdir=%{_builddir}/flix-engine-installer-linux-%{version}%{?with_demo:_DEMO}
+export tempdir=%{_builddir}/flix-engine-installer-linux-%{full_version}
. $(dirname "$0")/functions.sh
cd .flix-engine-installation-files
@@ -394,7 +396,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}%{?with_demo:_DEMO} (%(uname -o))'
+%{_sbindir}/lget -u "$FLIX_USERNAME" -s "$FLIX_SERIAL" -i %{_sysconfdir}/hostinfo -o %{_sysconfdir}/flixengine.lic -a 'On2FlixEngine/%{full_version} (%(uname -o))'
EOF
%clean
@@ -531,6 +533,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.42 2007/06/13 16:59:37 glen
+- eh, simplify
+
Revision 1.41 2007/06/13 16:57:11 glen
- support for non-demo tarball
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.41&r2=1.42&f=u
More information about the pld-cvs-commit
mailing list