SPECS: opera.spec update for discarded shared/static bcond, cosmetics

[glen]

Author: glen                         Date: Thu Jun 12 14:14:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
 update for discarded shared/static bcond, cosmetics

---- Files affected:
SPECS:
   opera.spec (1.264 -> 1.265) 

---- Diffs:

================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.264 SPECS/opera.spec:1.265
--- SPECS/opera.spec:1.264	Thu Jun 12 16:10:08 2008
+++ SPECS/opera.spec	Thu Jun 12 16:14:14 2008
@@ -4,15 +4,15 @@
 # - DEVEL - development version
 # - WEEKLY - weekly development version
 #
-# NOTE, to avoid creating unreadable/unmaintainable spec:
+# 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
-#
+
+%define		ver	9.50
+%define		shver	%(echo %{ver} | tr -d .)
+%define		buildid	2042
+
 Summary:	World fastest web browser
 Summary(pl.UTF-8):	Najszybsza przeglądarka WWW na świecie
 Name:		opera
@@ -27,8 +27,7 @@
 # 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
-
-Source4:	%{name}.desktop
+Source0:	%{name}.desktop
 Patch0:		%{name}-wrapper.patch
 URL:		http://www.opera.com/
 BuildRequires:	rpmbuild(macros) >= 1.356
@@ -46,13 +45,12 @@
 %description
 Opera is world fastest web browser. It supports most of nowaday
 extensions of HTML. And it is quite stable. This version is
-%{?with_shared:shared}%{!?with_shared:statically} linked with Qt.
+linked with shared version of 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
-%{?with_shared:dynamicznie}%{!?with_shared:statycznie} z Qt.
+wersja jest skonsolidowana dynamicznie z Qt.
 
 %package plugin32
 Summary:	Opera 32-bit plugins support
@@ -101,7 +99,7 @@
 	--docdir=%{_operadocdir}
 
 # install in kde etc.
-install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE0} $RPM_BUILD_ROOT%{_desktopdir}
 
 install etc/* $RPM_BUILD_ROOT%{_sysconfdir}
 install usr/share/pixmaps/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -192,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

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