Author: adamg Date: Fri Apr 14 17:52:28 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- updated to 8.54 (merged changes from HEAD)
---- Files affected:
SPECS:
opera.spec (1.159 -> 1.159.2.1)
---- Diffs:
================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.159 SPECS/opera.spec:1.159.2.1
--- SPECS/opera.spec:1.159 Fri Feb 17 17:57:45 2006
+++ SPECS/opera.spec Fri Apr 14 19:52:23 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 20060331
+%define magicstr 206
+%define with_snap 1
+%else
%if %{with snap}
%define ver 9.0
%define sver %{ver}
@@ -19,12 +28,13 @@
%define reltype Preview-2
%define magicstr %{nil}
%else
-%define ver 8.52
-%define sver 8.52
+%define ver 8.54
+%define sver 8.54
%define fix %{nil}
-%define dirrel 20060201
+%define dirrel 20060330
%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,13 +214,17 @@
%endif
%if %{need_ix86_static_snap}
+%if %{with weekly}
+Source30100:
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
%if %{need_sparc_static}
Source1:
ftp://ftp.opera.com/pub/opera/linux/%{shver}/%{reltype}/en/sparc/static/%{name}-%{sver}-%{sparc_static_rel}-static-qt.sparc-en.tar.bz2
-# Source1-md5: 2dec5155b24752517fbf1143d861f8f1
+# Source1-md5: 1225c949dca9782a82a4f275e4271a87
%{!?with_distributable:NoSource: 1}
%endif
@@ -227,19 +241,28 @@
%endif
%if %{need_ppc_static_snap}
+%if %{with weekly}
+Source30102:
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
%if %{need_ix86_shared}
Source20:
ftp://ftp.opera.com/pub/opera/linux/%{shver}/%{reltype}/en/i386/shared/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en.tar.bz2
-# Source20-md5: a1847d8693025a16188bc3c165eff71a
+# Source20-md5: 4887d49469a374b993010807dba79d32
%{!?with_distributable:NoSource: 20}
%endif
%if %{need_ix86_shared_snap}
+%if %{with weekly}
+Source301020:
http://snapshot.opera.com/unix/Weekly-%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en-%{magicstr}.tar.bz2
+# Source301020-md5: 1823140d8b02dba0297ba6d822176281
+%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
@@ -257,13 +280,18 @@
%if %{need_ppc_shared}
Source22:
ftp://ftp.opera.com/pub/opera/linux/%{shver}/%{reltype}/en/ppc/shared/%{name}-%{sver}-%{ppc_shared_rel}-shared-qt.ppc-en.tar.bz2
-# Source22-md5: 670e9fbc029a374187438e92a8c8602f
+# Source22-md5: 4f8270e2c590393266fd1e3a8ceaa5d3
%{!?with_distributable:NoSource: 22}
%endif
%if %{need_ppc_shared_snap}
+%if %{with weekly}
+Source301022:
http://snapshot.opera.com/unix/Weekly-%{magicstr}/ppc-linux/%{name}-%{sver}-%{ppc_shared_rel}-shared-qt.ppc-en-%{magicstr}.tar.bz2
+# Source301022-md5: 4ef11bec6221d79e30dfbbf76ff89fa3
+%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 +300,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 +321,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_weekly:30}%{?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
+%setup -q -T -b %{?with_weekly:30}%{?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_weekly:30}%{?with_snap:10}%{?with_shared:2}2 -n
%{name}-%{sver}-%{rel}-%{type}-qt.ppc-en%{?with_weekly:-%{magicstr}}
%endif
%install
@@ -308,7 +336,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 \
@@ -353,7 +382,7 @@
%files
%defattr(644,root,root,755)
-%doc LICENSE bugreport
+%doc LICENSE
%attr(755,root,root) %{_bindir}/*
%dir %{_libdir}/opera
%dir %{_libdir}/opera/bin
@@ -383,6 +412,25 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.159.2.1 2006/04/14 17:52:23 adamg
+- updated to 8.54 (merged changes from HEAD)
+
+Revision 1.164 2006/04/05 22:47:04 charles
+- updated to 8.54
+
+Revision 1.163 2006/04/03 15:52:23 arekm
+- new weekly
+
+Revision 1.162 2006/03/26 09:07:10 arekm
+- new weekly snap
+
+Revision 1.161 2006/02/26 18:16:36 arekm
+- weekly needs different numbers dear charles, otherwise no md5 can be updated
+
+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.159.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
