SPECS: opera.spec - added weekly snapshots version (with bcond) - ...

[charles]

Author: charles                      Date: Fri Feb 17 21:33:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added weekly snapshots version (with bcond)
- openmotif isn't already required for version 9

---- Files affected:
SPECS:
   opera.spec (1.159 -> 1.160) 

---- Diffs:

================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.159 SPECS/opera.spec:1.160
--- SPECS/opera.spec:1.159	Fri Feb 17 17:57:45 2006
+++ SPECS/opera.spec	Fri Feb 17 22:33:04 2006
@@ -6,11 +6,20 @@
 %bcond_without	distributable	# distributable or not
 %bcond_without	incall		# include all tarballs into src.rpm (but splitted into shared/static)
 %bcond_with	snap		# snap version
+%bcond_with	weekly		# weekly snapshot version
 
 %ifarch sparc64 sparc
 %undefine with_shared
 %endif
 
+%if %{with weekly}
+%define	ver		9.0
+%define	sver		%{ver}
+%define	fix		%{nil}
+%define	dirrel		20060217
+%define	magicstr	1656
+%define with_snap	1
+%else
 %if %{with snap}
 %define	ver		9.0
 %define	sver		%{ver}
@@ -25,6 +34,7 @@
 %define	dirrel		20060201
 %define	reltype		final
 %endif
+%endif
 
 %define	shver		%(echo %{ver} | tr -d .)%{fix}
 %define	x86_shared_rel		%{dirrel}.5
@@ -83,7 +93,7 @@
 %else
 #			with shared:	[else]
 %define	need_ix86_static_snap	1
-%define	need_sparc_static_snap	0
+%define	need_sparc_static_snap	1
 %define	need_ppc_static_snap	1
 %endif
 #			with shared;	[endif]
@@ -204,7 +214,11 @@
 %endif
 
 %if %{need_ix86_static_snap}
+%if %{with weekly}
+Source100:	http://snapshot.opera.com/unix/Weekly-%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_static_rel}-static-qt.i386-en-%{magicstr}.tar.bz2
+%else
 Source100:	http://snapshot.opera.com/unix/%{ver}-%{reltype}/%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_static_rel}-static-qt.i386-en.tar.bz2
+%endif
 %{!?with_distributable:NoSource:	100}
 %endif
 
@@ -227,7 +241,11 @@
 %endif
 
 %if %{need_ppc_static_snap}
+%if %{with weekly}
+Source102:	http://snapshot.opera.com/unix/Weekly-%{magicstr}/ppc-linux/%{name}-%{sver}-%{ppc_static_rel}-static-qt.ppc-en-%{magicstr}.tar.bz2
+%else
 Source102:	http://snapshot.opera.com/unix/%{ver}-%{reltype}/%{magicstr}/ppc-linux/%{name}-%{sver}-%{ppc_static_rel}-static-qt.ppc-en.tar.bz2
+%endif
 %{!?with_distributable:NoSource:	102}
 %endif
 
@@ -238,8 +256,12 @@
 %endif
 
 %if %{need_ix86_shared_snap}
+%if %{with weekly}
+Source1020:	http://snapshot.opera.com/unix/Weekly-%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en-%{magicstr}.tar.bz2
+%else
 Source1020:	http://snapshot.opera.com/unix/%{ver}-%{reltype}/%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en.tar.bz2
 # Source1020-md5:	6f296be6b9fc3001588d4509016062bd
+%endif
 %{!?with_distributable:NoSource:	1020}
 %endif
 
@@ -262,8 +284,12 @@
 %endif
 
 %if %{need_ppc_shared_snap}
+%if %{with weekly}
+Source1022:	http://snapshot.opera.com/unix/Weekly-%{magicstr}/ppc-linux/%{name}-%{sver}-%{ppc_shared_rel}-shared-qt.ppc-en-%{magicstr}.tar.bz2
+%else
 Source1022:	http://snapshot.opera.com/unix/%{ver}-%{reltype}/%{magicstr}/ppc-linux/%{name}-%{sver}-%{ppc_shared_rel}-shared-qt.ppc-en.tar.bz2
 # Source1022-md5:	74985fa6da49b2e54c9d03dab1119325
+%endif
 %{!?with_distributable:NoSource:	1022}
 %endif
 
@@ -272,7 +298,7 @@
 URL:		http://www.opera.com/
 BuildRequires:	sed >= 4.0
 Requires:	freetype >= 2
-Requires:	openmotif >= 2
+%{!?with_snap:Requires:	openmotif >= 2}
 Provides:	wwwbrowser
 ExclusiveArch:	%{ix86} ppc sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -293,13 +319,13 @@
 
 %prep
 %ifarch %{ix86}
-%setup -q -T -b %{?with_snap:10}%{?with_shared:2}0 -n %{name}-%{sver}-%{rel}-%{type}-qt.i386-en
+%setup -q -T -b %{?with_snap:10}%{?with_shared:2}0 -n %{name}-%{sver}-%{rel}-%{type}-qt.i386-en%{?with_weekly:-%{magicstr}}
 %endif
 %ifarch sparc sparc64
 %setup -q -T -b %{?with_snap:10}%{?with_shared:2}1 -n %{name}-%{sver}-%{rel}-%{type}-qt.sparc-en
 %endif
 %ifarch ppc
-%setup -q -T -b %{?with_snap:10}%{?with_shared:2}2 -n %{name}-%{sver}-%{rel}-%{type}-qt.ppc-en
+%setup -q -T -b %{?with_snap:10}%{?with_shared:2}2 -n %{name}-%{sver}-%{rel}-%{type}-qt.ppc-en%{?with_weekly:-%{magicstr}}
 %endif
 
 %install
@@ -308,7 +334,8 @@
 install -d $RPM_BUILD_ROOT{/etc,%{_libdir},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
 ln -s $RPM_BUILD_ROOT/etc  $RPM_BUILD_ROOT%{_prefix}/etc
 
-sed -i -e 's|/etc|$RPM_BUILD_ROOT%{_sysconfdir}|' install.sh
+sed -i -e 's|/etc|$RPM_BUILD_ROOT%{_sysconfdir}|' \
+	-e 's|OPERA_SCRIPT_PATH=$0|OPERA_SCRIPT_PATH=|' install.sh
 
 echo y |\
 sh install.sh \
@@ -383,6 +410,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2006/02/17 21:33:04  charles
+- added weekly snapshots version (with bcond)
+- openmotif isn't already required for version 9
+
 Revision 1.159  2006/02/17 16:57:45  arekm
 - up to 8.52
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opera.spec?r1=1.159&r2=1.160&f=u