SPECS: opera.spec - add plain amd64 support

glen glen at pld-linux.org
Tue Sep 4 13:59:53 CEST 2007


Author: glen                         Date: Tue Sep  4 11:59:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add plain amd64 support

---- Files affected:
SPECS:
   opera.spec (1.245 -> 1.246) 

---- Diffs:

================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.245 SPECS/opera.spec:1.246
--- SPECS/opera.spec:1.245	Tue Sep  4 13:12:37 2007
+++ SPECS/opera.spec	Tue Sep  4 13:59:48 2007
@@ -2,6 +2,7 @@
 # TODO:
 # - move translations into a separate, noarch package
 # - add kestrel (snap) x86_64 version (yes, it's available)
+# - drop those dozens of if statements and use branches for different sources
 #
 %bcond_without	shared		# static or shared version
 %bcond_without	distributable	# distributable or not
@@ -312,6 +313,12 @@
 %endif
 %endif
 
+%ifarch %{x8664}
+Source23:	http://snapshot.opera.com/unix/9.50-Alpha-1/x86_64-linux/%{name}-%{version}-%{dirrel}.2-shared-qt.x86_64-%{magicstr}.tar.bz2
+# Source23-md5:	40b850632dbb729a0bb16a1c450d97e5
+%{!?with_distributable:NoSource:	23}
+%endif
+
 Source4:	%{name}.desktop
 Patch0:		%{name}-wrapper.patch
 URL:		http://www.opera.com/
@@ -320,7 +327,7 @@
 Requires:	browser-plugins >= 2.0
 Requires:	freetype >= 2
 Provides:	wwwbrowser
-ExclusiveArch:	%{ix86} ppc sparc sparcv9
+ExclusiveArch:	%{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_plugindir	%{_libdir}/opera/plugins
@@ -340,6 +347,9 @@
 %ifarch %{ix86}
 %setup -q -T -b %{?with_weekly:30}%{?with_snap:10}%{?with_shared:2}0 -n %{name}-%{sver}-%{rel}-%{type}-qt.i386%{!?with_snap:-en}%{?magicstr:-%{magicstr}}
 %endif
+%ifarch %{x8664}
+%setup -q -T -b 23 -n %{name}-%{version}-%{dirrel}.2-shared-qt.x86_64-%{magicstr}
+%endif
 %ifarch sparc sparcv9
 %setup -q -T -b %{?with_weekly:30}%{?with_snap:10}%{?with_shared:2}1 -n %{name}-%{sver}-%{rel}-%{type}-qt.sparc%{!?with_snap:-en}-en%{?magicstr:-%{magicstr}}
 %endif
@@ -366,7 +376,8 @@
 sh install.sh \
 	DESTDIR=$RPM_BUILD_ROOT \
 	--prefix=%{_prefix} \
-	--exec_prefix=%{_libdir}/opera/bin \
+	--exec_prefix=%{_libdir}/%{name}/bin \
+	--plugindir=%{_libdir}/%{name}/plugins \
 	--docdir=%{_operadocdir}
 
 # install in kde etc.
@@ -428,6 +439,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opera.spec?r1=1.245&r2=1.246&f=u



More information about the pld-cvs-commit mailing list