SPECS: opera.spec - up to 9.51 snap 2050
arekm
arekm at pld-linux.org
Sun Jun 22 20:59:13 CEST 2008
Author: arekm Date: Sun Jun 22 18:59:12 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 9.51 snap 2050
---- Files affected:
SPECS:
opera.spec (1.269 -> 1.270)
---- Diffs:
================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.269 SPECS/opera.spec:1.270
--- SPECS/opera.spec:1.269 Thu Jun 12 20:37:20 2008
+++ SPECS/opera.spec Sun Jun 22 20:59:06 2008
@@ -2,32 +2,117 @@
# BRANCHES:
# - HEAD - stable version
# - DEVEL - development version
-# - WEEKLY - weekly development version
-#
-# NOTE: to avoid creating unreadable/unmaintainable spec:
-# - don't put static version here, create STATIC branch for that for example
-# - don't create useless bconds that for example limit SourceX: to current arch only
-#
-
-%define ver 9.50
-%define shver %(echo %{ver} | tr -d .)
-%define buildid 2042
+# - WEEKLY - weekly development version (sometimes it's on DEVEL)
+%bcond_without shared # static or shared version
+%bcond_without distributable # distributable or not
+%bcond_with snap # snap version
+%bcond_with weekly # weekly snapshot version
+
+%define ver 9.51
+%define reltype snapshot
+%define magicstr 2050
+
+%define sver %{ver}
+%define shver %(echo %{ver} | tr -d .)
+%define sreltype %(echo %{reltype} | tr - _)
+
+# http://my.opera.com/csant/blog/2007/09/06/which-is-which
+# http://my.opera.com/csant/blog/2008/05/20/which-is-which-part-two
+%define x86_shared_rel gcc4-shared-qt3
+%define x86_static_rel gcc4-qt4
+%define sparc_shared_rel unknown
+%define sparc_static_rel unknown
+%define ppc_shared_rel gcc4-shared-qt3
+%define ppc_static_rel gcc295-static-qt3
+%define x86_64_shared_rel gcc4-shared-qt3
+%define x86_64_static_rel unknown
+
+%if %{with shared}
+
+%define type shared
+
+# Defined to be able to build src.rpm also on not supported archs
+%define rawrel %{x86_shared_rel}
+
+%ifarch sparc sparcv9
+%define rawrel %{sparc_shared_rel}
+%endif
+
+%ifarch ppc
+%define rawrel %{ppc_shared_rel}
+%endif
+
+%ifarch %{x8664}
+%define rawrel %{x86_64_shared_rel}
+%endif
+
+%else # [with shared]
+
+%define type static
+
+# Defined to be able to build src.rpm also on not supported archs
+%define rawrel %{x86_static_rel}
+
+%ifarch sparc sparcv9
+%define rawrel %{sparc_static_rel}
+%endif
+
+%ifarch ppc
+%define rawrel %{ppc_static_rel}
+%endif
+
+%ifarch %{x8664}
+%define rawrel %{x86_64_static_rel}
+%endif
+
+%endif # [with shared]
+
+%define rel %(echo %{rawrel} | tr - _)
+
+%define _rel 1
Summary: World fastest web browser
Summary(pl.UTF-8): Najszybsza przeglądarka WWW na świecie
Name: opera
Version: %{ver}
-Release: 4
+Release: 0.%{?magicstr:%{magicstr}.}%{rel}.%{_rel}.%{sreltype}
Epoch: 2
License: Distributable
Group: X11/Applications/Networking
-Source10: ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/i386/shared/%{name}-%{version}.gcc4-shared-qt3.i386.tar.bz2
-# Source10-md5: 34392767b4e1e233c682600d563d659f
-Source11: ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/x86_64/%{name}-%{version}.gcc4-shared-qt3.x86_64.tar.bz2
-# Source11-md5: 091ed5b0f8a7541c7555744defca7a6c
-Source12: ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/ppc/shared/%{name}-%{version}.gcc4-shared-qt3.ppc.tar.bz2
-# Source12-md5: c1b01ac1051c52a433514c3545bacac0
-Source0: %{name}.desktop
+
+Source0: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_shared_rel}.i386.tar.bz2
+# Source0-md5: 6bd26d0d6aa28dde514ea5469ca5734e
+%{!?with_distributable:NoSource: 0}
+
+#Source1: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/sparc-linux/%{name}-%{sver}-%{magicstr}.%{sparc_shared_rel}-shared-qt.sparc.tar.bz2
+## Source1-md5: 913ccb28106f9f5acd3d94c8dc71ae1
+#%{!?with_distributable:NoSource: 1}
+
+Source2: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/ppc-linux/%{name}-%{sver}-%{magicstr}.%{ppc_shared_rel}.ppc.tar.bz2
+# Source2-md5: e105411f31fc38d92f5894b366c652ae
+%{!?with_distributable:NoSource: 2}
+
+#Source3: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/x86_64-linux/%{name}-%{sver}-%{magicstr}.%{x86_64_shared_rel}.x86_64.tar.bz2
+# Source3-md5: a13778ebd81beab3503fb4a539140581
+#%{!?with_distributable:NoSource: 3}
+
+Source10: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_static_rel}.i386.tar.bz2
+# Source10-md5: dd13f3f1854ad1f6c8af627203241ff6
+%{!?with_distributable:NoSource: 10}
+
+#Source11: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/sparc-linux/%{name}-%{sver}-%{magicstr}.%{sparc_static_rel}.sparc.tar.bz2
+## Source11-md5: e190021f5530de3f711006cd9f6bb339
+#%{!?with_distributable:NoSource: 11}
+
+#Source12: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/ppc-linux/%{name}-%{sver}-%{magicstr}.%{ppc_static_rel}.ppc.tar.bz2
+## Source12-md5: 59c2f6f710c2efabeac9e153fa934743
+#%{!?with_distributable:NoSource: 12}
+
+#Source13: http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/x86_64-linux/%{name}-%{sver}-%{magicstr}.%{x86_64_static_rel}.x86_64.tar.bz2
+## Source13-md5: 40b850632dbb729a0bb16a1c450d97e5
+#%{!?with_distributable:NoSource: 13}
+
+Source4: %{name}.desktop
Patch0: %{name}-wrapper.patch
URL: http://www.opera.com/
BuildRequires: rpmbuild(macros) >= 1.356
@@ -36,30 +121,28 @@
Requires: freetype >= 2
Provides: wwwbrowser
Obsoletes: opera-i18n
-ExclusiveArch: %{ix86} %{x8664} ppc
+ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _plugindir %{_libdir}/opera/plugins
%define _operadocdir %{_docdir}/%{name}-%{ver}
-# alternative arch for plugin32
-%define alt_arch i386
%description
Opera is world fastest web browser. It supports most of nowaday
extensions of HTML. And it is quite stable. This version is
-linked with shared version of Qt.
+%{?with_shared:shared}%{!?with_shared:statically} linked with Qt.
%description -l pl.UTF-8
Opera jest najszybszą przeglądarką WWW na świecie. Obsługuje większość
dzisiejszych rozszerzeń HTML-a. Dodatkowo jest w miarę stabilna. Ta
-wersja jest skonsolidowana dynamicznie z Qt.
+wersja jest skonsolidowana
+%{?with_shared:dynamicznie}%{!?with_shared:statycznie} z Qt.
%package plugin32
Summary: Opera 32-bit plugins support
Summary(pl.UTF-8): Obsługa 32-bitowych wtyczek Opery
Group: X11/Applications/Networking
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: browser-plugins >= 2.0
%description plugin32
Opera 32-bit plugins support.
@@ -69,14 +152,21 @@
%prep
%ifarch %{ix86}
-%setup -q -T -b 10 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.i386
+%setup -q -T -b %{!?with_shared:1}0 -n %{name}-%{sver}-%{?magicstr:%{magicstr}.}%{rawrel}.i386
%endif
-%ifarch %{x8664}
-%setup -q -T -b 11 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.x86_64
+
+%ifarch sparc sparcv9
+%setup -q -T -b %{!?with_shared:1}1 -n %{name}-%{sver}-%{?magicstr:%{magicstr}.}%{rawrel}.sparc
%endif
+
%ifarch ppc
-%setup -q -T -b 12 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.ppc
+%setup -q -T -b %{!?with_shared:1}2 -n %{name}-%{sver}-%{?magicstr:%{magicstr}.}%{rawrel}.ppc
%endif
+
+%ifarch %{x8664}
+%setup -q -T -b %{!?with_shared:1}3 -n %{name}-%{sver}-%{?magicstr:%{magicstr}.}%{rawrel}.x86_64
+%endif
+
%patch0 -p1
%install
@@ -94,20 +184,6 @@
libjavaplugin_oji.so
EOF
-%ifarch %{x8664}
-install -d $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/plugins
-%browser_plugins_add_browser %{name} -a %{alt_arch} -p %{_prefix}/lib/%{name}/plugins -b <<'EOF'
-# opera does not use for .xpt files
-*.xpt
-
-# use mplayerplug-in-opera instead
-mplayerplug-in*
-
-# opera uses libjava.so to run java
-libjavaplugin_oji.so
-EOF
-%endif
-
sh install.sh \
DESTDIR=$RPM_BUILD_ROOT \
--prefix=%{_prefix} \
@@ -116,7 +192,7 @@
--docdir=%{_operadocdir}
# install in kde etc.
-install %{SOURCE0} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
install etc/* $RPM_BUILD_ROOT%{_sysconfdir}
install usr/share/pixmaps/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -132,22 +208,14 @@
%update_browser_plugins
fi
-%post plugin32
-%update_browser_plugins
-
-%postun plugin32
-if [ "$1" = 0 ]; then
- %update_browser_plugins
-fi
-
%files
%defattr(644,root,root,755)
%doc LICENSE
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*rc*
# browser plugins v2
-%{_browserpluginsconfdir}/browsers.d/%{name}.%{_target_base_arch}
-%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.%{_target_base_arch}.blacklist
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
%attr(755,root,root) %{_bindir}/*
%dir %{_libdir}/opera
@@ -173,7 +241,7 @@
%lang(de) %{_datadir}/opera/locale/de
%lang(el) %{_datadir}/opera/locale/el
%lang(en_GB) %{_datadir}/opera/locale/en-GB
-%lang(es) %{_datadir}/opera/locale/es-ES
+%lang(es_ES) %{_datadir}/opera/locale/es-ES
%lang(es_LA) %{_datadir}/opera/locale/es-LA
%lang(fi) %{_datadir}/opera/locale/fi
%lang(fr) %{_datadir}/opera/locale/fr
@@ -206,12 +274,7 @@
%ifarch %{x8664}
%files plugin32
%defattr(644,root,root,755)
-# browser plugins v2
-%{_browserpluginsconfdir}/browsers.d/%{name}.%{alt_arch}
-%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.%{alt_arch}.blacklist
-%dir %{_prefix}/lib/%{name}
-%dir %{_prefix}/lib/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/bin/*-ia32-*
+%attr(755,root,root) %{_libdir}/opera/bin/*-ia32-*
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -220,676 +283,131 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.269 2008/06/12 18:37:20 glen
-- mention removed/added arches for 9.50 update
-
-Revision 1.268 2008-06-12 18:31:12 glen
-- rel 4
-
-Revision 1.267 2008-06-12 17:51:44 glen
-- add browser-plugins v2 system to -plugin32
-
-Revision 1.266 2008-06-12 16:25:05 qboosh
-- unified: just lang(es) for es_ES
-
-Revision 1.265 2008-06-12 14:14:14 glen
-- update for discarded shared/static bcond, cosmetics
-
-Revision 1.264 2008-06-12 14:10:08 glen
-- release 3
-
-Revision 1.263 2008-06-12 11:06:50 arekm
-- rel 2; 32bit plugins support subpackage for x86_64
-
-Revision 1.262 2008-06-12 11:00:50 arekm
-- up to 9.50 stable
- [sparc, sparcv9 arches dropped, x86_64 arch added]
-
-Revision 1.261 2008-04-03 21:24:51 glen
-- release 2 (1 for ac)
-
-Revision 1.260 2008-04-03 21:24:23 glen
-- release 1
-
-Revision 1.259 2008-04-03 21:11:07 paszczus
-- updated to 9.27
-
-Revision 1.258 2008-02-29 11:36:22 glen
-- CVE refs for 9.26 (taken from SuXE announcement)
-
-Revision 1.257 2008-02-20 21:44:10 arekm
-- up to 9.26 [CVE-2008-1080, CVE-2008-1081, CVE-2008-1082]
-
-Revision 1.256 2007-12-19 14:05:32 glen
-- rel 2 (rel 1 for ac)
-
-Revision 1.255 2007-12-19 13:58:54 arekm
-- up to 9.25
-
-Revision 1.254 2007-10-31 12:29:46 glen
-- typo
-
-Revision 1.253 2007/10/31 11:06:34 glen
-- more simplify
-
-Revision 1.252 2007/10/31 11:05:21 glen
-- simplify
-
-Revision 1.251 2007/10/31 11:04:10 glen
-- try to sort out the tree of conditions
-- typo in sparc setup line
-
-Revision 1.250 2007/10/30 23:07:31 glen
-- fix sparc build (enable sparc shared). why it was disabled?; rel 2
-
-Revision 1.249 2007/10/17 16:16:10 arekm
-- up to 9.24; SECURITY
-
-Revision 1.248 2007/09/04 17:06:55 arekm
-- drop weekly (see WEEKLY branch) and snap (see DEVEL branch)
-
-Revision 1.247 2007/09/04 16:05:11 arekm
-- info about branches
-
-Revision 1.246 2007/09/04 11:59:48 glen
-- add plain amd64 support
-
-Revision 1.245 2007/09/04 11:12:37 arekm
-- snap up to 9.50 (first alpha version of kestrel)
-
-Revision 1.244 2007/08/15 16:59:27 arekm
-- up to 9.23
-
-Revision 1.243 2007/08/09 16:55:13 arekm
-- weekly 660
-
-Revision 1.242 2007/08/04 09:36:49 arekm
-9.23 weekly 657
-
-Revision 1.241 2007/07/19 19:26:47 arekm
-- up to version 9.22 final
-
-Revision 1.240 2007/07/11 07:10:22 arekm
-- weekly 652
-
-Revision 1.239 2007/07/07 18:05:38 arekm
-- 9.22 weekly 651
-
-Revision 1.238 2007/06/25 15:39:38 glen
-- tab
-
-Revision 1.237 2007/06/24 19:24:15 arekm
-- define nil reltype for specparser.pl
-
-Revision 1.236 2007/06/12 06:34:00 arekm
-- fix md5
-
-Revision 1.235 2007/05/21 20:17:53 arekm
-- final 9.21
-
-Revision 1.234 2007/05/14 21:53:58 arekm
-- up to 9.21 weekly 641
-
-Revision 1.233 2007/04/11 14:40:28 arekm
-- rel 1
-
-Revision 1.232 2007/04/11 14:39:39 arekm
-- up to 9.20 final
-
-Revision 1.231 2007/04/06 15:51:35 arekm
-- up weekly to 633
-
-Revision 1.230 2007/04/01 18:57:03 qboosh
-- (32-bit) sparcv9, not sparc64
-
-Revision 1.229 2007/03/30 17:23:16 arekm
-- weekly 628
-
-Revision 1.228 2007/03/24 11:32:11 arekm
-- up to weekly 617
-
-Revision 1.227 2007/03/17 23:29:35 arekm
-- up to 598
-
-Revision 1.226 2007/03/13 09:31:36 sparky
-- speadup for new specparser.pl (about 600 posibilities instead of 6000)
-
-Revision 1.225 2007/02/28 19:20:15 arekm
-- weekly 577
-
-Revision 1.224 2007/02/15 13:41:27 glen
-- opera does not use java-sun browser plugin
-
-Revision 1.223 2007/02/13 07:16:51 glen
-- tabs in preamble
-
-Revision 1.222 2007/02/12 00:49:17 baggins
-- converted to UTF-8
-
-Revision 1.221 2007/02/03 06:13:29 arekm
-- up to build 557
-
-Revision 1.220 2007/01/19 21:28:02 arekm
-- up to 543
-
-Revision 1.219 2007/01/14 19:26:00 arekm
-- build 536
-
-Revision 1.218 2007/01/10 14:21:21 glen
-- mplayerplug-in has own package for opera
-
-Revision 1.217 2007/01/09 23:07:27 glen
-- browser plugins v2
-- rel 4
-
-Revision 1.216 2006/12/22 16:16:23 glen
-- rel 3
-
-Revision 1.215 2006/12/18 11:20:03 arekm
-- final opera 9.10
-
-Revision 1.214 2006/12/14 19:43:22 arekm
-- up to weekly 521
-
-Revision 1.213 2006/12/07 15:03:47 arekm
-- disable ppc/sparc for weekly
-
-Revision 1.212 2006/12/07 14:54:30 arekm
-- weekly 507
-
-Revision 1.211 2006/12/01 16:48:04 glen
-- rel 4 (don't depend on jpackage-utils)
-
-Revision 1.210 2006/12/01 16:41:46 arekm
-- up to weekly 505
-
-Revision 1.209 2006/11/30 15:31:17 glen
-- patch wrapper script for JAVA_HOME setting from jpackage-utils; rel 3
-
-Revision 1.208 2006/11/24 20:04:17 arekm
-- up to weekly 499
-
-Revision 1.207 2006/11/17 18:18:31 arekm
-- up to weekly 494
-
-Revision 1.206 2006/11/10 19:26:20 arekm
-- up to weekly 490
+Revision 1.270 2008/06/22 18:59:06 arekm
+- up to 9.51 snap 2050
-Revision 1.205 2006/11/09 00:43:54 charles
-- removed install.sh hack (no longer needed)
+Revision 1.246.2.40 2008/06/10 17:43:50 adamg
+- up to 2034 (9.50-RC)
-Revision 1.204 2006/11/08 19:29:13 glen
-- not confusing mv
+Revision 1.246.2.39 2008-06-07 09:41:59 charles
+- up to 2025
-Revision 1.203 2006/11/08 17:30:01 arekm
-- fixed todo item
+Revision 1.246.2.38 2008-06-05 20:45:52 arekm
+- up to 2021
-Revision 1.202 2006/11/08 15:56:24 glen
-- fix static md5
+Revision 1.246.2.37 2008-05-30 15:44:13 arekm
+- up to 1997
-Revision 1.201 2006/11/08 15:53:20 glen
-- update todo
+Revision 1.246.2.36 2008-05-28 18:34:45 arekm
+- up to 1992
-Revision 1.200 2006/11/03 17:22:16 charles
-- up to 478 weekly (9.10 RC1)
+Revision 1.246.2.35 2008-05-24 15:45:41 arekm
+- up to 1983
-Revision 1.199 2006/10/21 00:11:51 charles
-- new (466) weekly
+Revision 1.246.2.34 2008-05-21 16:04:47 arekm
+- use magicstr in release
-Revision 1.198 2006/09/22 06:22:56 arekm
-- back to rel 2 for final
+Revision 1.246.2.33 2008-05-21 16:01:01 arekm
+- up to 1971; new tarball naming scheme; i18n support
-Revision 1.197 2006/09/22 06:21:33 arekm
-- up to 9.02
+Revision 1.246.2.32 2008-05-10 18:23:07 adamg
+- up to 1962
-Revision 1.196 2006/09/09 14:40:48 arekm
-- up to 9.02 419 builddir
+Revision 1.246.2.31 2008-05-08 12:14:31 arekm
+- up to 1951
-Revision 1.195 2006/08/11 10:10:38 arekm
-- 9.01
+Revision 1.246.2.30 2008-04-18 06:51:22 arekm
+- up to 1929
-Revision 1.194 2006/07/29 14:07:58 arekm
-- up to 400 weekly
+Revision 1.246.2.29 2008-04-08 18:51:18 arekm
+- up to 1904
-Revision 1.193 2006/07/25 06:47:23 arekm
-- up to 20060724
+Revision 1.246.2.28 2008-03-29 12:05:44 arekm
+- up to 1887
-Revision 1.192 2006/07/23 18:45:40 arekm
-- up to 20060721
+Revision 1.246.2.27 2008-03-18 18:41:41 arekm
+- up to 1875
-Revision 1.191 2006/07/08 17:22:26 arekm
-- 383 weekly
+Revision 1.246.2.26 2008-02-29 16:19:11 arekm
+- up to 1834
-Revision 1.190 2006/07/07 15:19:50 glen
-- fix build for sparc, rel 2
+Revision 1.246.2.25 2008-02-22 18:41:18 arekm
+- up to 1923
-Revision 1.189 2006/06/30 17:46:07 arekm
-- up to weekly 379
+Revision 1.246.2.24 2008-02-22 15:02:24 arekm
+- url explaining which is which
-Revision 1.188 2006/06/23 17:33:01 arekm
-- weekly 362
+Revision 1.246.2.23 2008-02-01 17:52:26 arekm
+- up to 1786
-Revision 1.187 2006/06/20 17:47:42 charles
-- more md5
+Revision 1.246.2.22 2008-01-26 15:11:56 arekm
+- up to 1772
-Revision 1.186 2006/06/20 14:13:01 shadzik
-- up to 9.0 final
+Revision 1.246.2.21 2008-01-19 19:35:49 arekm
+- up to snap 1766
-Revision 1.185 2006/06/19 06:43:37 arekm
-- 344
+Revision 1.246.2.20 2008-01-11 19:13:54 arekm
+- up to 1754
-Revision 1.184 2006/06/16 08:00:53 arekm
-- up to 342
+Revision 1.246.2.19 2008-01-07 16:44:20 qboosh
+- pl for -plugin32
-Revision 1.183 2006/06/15 08:31:34 arekm
-- 339
+Revision 1.246.2.18 2008-01-07 10:04:01 arekm
+- separate 32bit plugin support to subpackage (on x86_64)
-Revision 1.182 2006/06/12 22:19:30 charles
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opera.spec?r1=1.269&r2=1.270&f=u
More information about the pld-cvs-commit
mailing list