Author: shadzik Date: Fri Sep 4 17:32:44 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- add qt4 version for x86_64
- reverse qt4 bcond - now it's our default
- rel 4
---- Files affected:
packages/opera:
opera.spec (1.295 -> 1.296)
---- Diffs:
================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.295 packages/opera/opera.spec:1.296
--- packages/opera/opera.spec:1.295 Fri Sep 4 19:01:13 2009
+++ packages/opera/opera.spec Fri Sep 4 19:32:38 2009
@@ -9,7 +9,7 @@
# - don't create useless bconds that for example limit SourceX: to current
arch only
#
-%bcond_with qt4 #take the qt4 version
+%bcond_without qt4 #take the qt4 version
%define ver 10.00
%define shver %(echo %{ver} | tr -d .)
@@ -19,7 +19,7 @@
Summary(pl.UTF-8): Najszybsza przeglądarka WWW na świecie
Name: opera
Version: %{ver}
-Release: 3
+Release: 4
Epoch: 2
License: Distributable
Group: X11/Applications/Networking
@@ -31,6 +31,8 @@
# Source12-md5: 6b25420f7f7a571b0c305c1f9ac03579
Source13:
ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/i386/%{name}-%{version}.gcc4-qt4.i386.tar.bz2
# Source13-md5: 0b484b74ee07e5ac93f153dd33e25437
+Source14:
ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/x86_64/%{name}-%{version}.gcc4-qt4.x86_64.tar.bz2
+# Source14-md5: af8230636786a5c76b267d813db52614
Source0: %{name}.desktop
Patch0: %{name}-wrapper.patch
Patch1: %{name}-agent-qt4.patch
@@ -84,8 +86,13 @@
%endif
%endif
%ifarch %{x8664}
+%if %{with qt4}
+%setup -q -T -b 14 -n %{name}-%{version}-%{buildid}.gcc4-qt4.x86_64
+%define _noautoreq 'libpng12.so.0(.*)'
+%else
%setup -q -T -b 11 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.x86_64
%endif
+%endif
%ifarch ppc
%setup -q -T -b 12 -n %{name}-%{version}-%{buildid}.gcc4-shared-qt3.ppc
%endif
@@ -259,6 +266,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.296 2009/09/04 17:32:38 shadzik
+- add qt4 version for x86_64
+- reverse qt4 bcond - now it's our default
+- rel 4
+
Revision 1.295 2009/09/04 17:01:13 shadzik
- add agent patch for qt4 version
- rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.295&r2=1.296&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
