packages (DEVEL): opera/opera.spec qt3 by default

[arekm]

Author: arekm                        Date: Wed Jul 22 07:17:20 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
qt3 by default

---- Files affected:
packages/opera:
   opera.spec (1.246.2.74.2.1 -> 1.246.2.74.2.2) 

---- Diffs:

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.1 packages/opera/opera.spec:1.246.2.74.2.2
--- packages/opera/opera.spec:1.246.2.74.2.1	Tue Jul 21 22:30:37 2009
+++ packages/opera/opera.spec	Wed Jul 22 09:17:13 2009
@@ -8,6 +8,7 @@
 %bcond_without	distributable	# distributable or not
 %bcond_with	snap		# snap version
 %bcond_with	weekly		# weekly snapshot version
+%bcond_with	qt4
 
 %define	ver		10.00
 %define	reltype		snapshot
@@ -20,15 +21,21 @@
 
 # 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-qt4
 %define	x86_static_rel		gcc4-static-qt3
 %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-qt4
 %define x86_64_static_rel       unknown
 
+%if %{with qt4}
+%define x86_64_shared_rel       gcc4-qt4
+%define x86_shared_rel          gcc4-qt4
+%else
+%define x86_64_shared_rel       gcc4-shared-qt3
+%define x86_shared_rel          gcc4-shared-qt3
+%endif
+
 %if %{with shared}
 
 %define	type		shared
@@ -82,7 +89,7 @@
 Group:		X11/Applications/Networking
 
 Source0:	http://snapshot.opera.com/unix/%{sreltype}-%{smagicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_shared_rel}.i386.tar.bz2
-# Source0-md5:	3dde2e9e156916efd38d23386c76da80
+# Source0-md5:	3f4427dd44d2fdae6292844b87af28d5
 %{!?with_distributable:NoSource:	0}
 
 #Source1:	http://snapshot.opera.com/unix/%{sreltype}-%{smagicstr}/sparc-linux/%{name}-%{sver}-%{magicstr}.%{sparc_shared_rel}-shared-qt.sparc.tar.bz2
@@ -94,7 +101,7 @@
 #%{!?with_distributable:NoSource:	2}
 
 Source3:	http://snapshot.opera.com/unix/%{sreltype}-%{smagicstr}/x86_64-linux/%{name}-%{sver}-%{magicstr}.%{x86_64_shared_rel}.x86_64.tar.bz2
-# Source3-md5:	3c93d61ca3e0817cdea69d7308d8e984
+# Source3-md5:	af6ae55c449b8d4dc5eeca1f1a291958
 %{!?with_distributable:NoSource:        3}
 
 #Source10:	http://snapshot.opera.com/unix/%{sreltype}-%{smagicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_static_rel}.i386.tar.bz2
@@ -296,6 +303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.2  2009/07/22 07:17:13  arekm
+qt3 by default
+
 Revision 1.246.2.74.2.1  2009/07/21 20:30:37  charles
 - up to 4502
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.1&r2=1.246.2.74.2.2&f=u