SPECS: kdebase.spec, kdenetwork.spec - merge with AC-branch

[glen]

Author: glen                         Date: Sat Apr  1 17:08:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with AC-branch

---- Files affected:
SPECS:
   kdebase.spec (1.499 -> 1.500) , kdenetwork.spec (1.214 -> 1.215) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.499 SPECS/kdebase.spec:1.500
--- SPECS/kdebase.spec:1.499	Sun Mar 26 18:10:52 2006
+++ SPECS/kdebase.spec	Sat Apr  1 19:07:57 2006
@@ -13,9 +13,7 @@
 %bcond_without	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 #
 %define		_state		stable
-%define		_kdever		3.5.2
-%define		_ver		3.5.2
-%define		_minlibsevr	9:3.5.2
+%define		_minlibsevr	9:%{version}
 
 Summary:	K Desktop Environment - core files
 Summary(es):	K Desktop Environment - archivos básicos
@@ -27,12 +25,12 @@
 Summary(uk):	K Desktop Environment - ÂÁÚĎ׌ ĆÁĘĚÉ
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
-Version:	%{_ver}
+Version:	3.5.2
 Release:	1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	c5685e1be34e033286aa1f37002a0552
 Source1:	%{name}-kdesktop.pam
 Source2:	%{name}-kdm.pam
@@ -2869,6 +2867,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.500  2006/04/01 17:07:57  glen
+- merge with AC-branch
+
 Revision 1.499  2006/03/26 16:10:52  arekm
 - up to 3.5.2, no man pages
 
@@ -2896,6 +2897,12 @@
 - cut changelog
 - modular xorg deps
 - enable hidden visibility
+
+Revision 1.491.2.2  2006/04/01 17:00:41  glen
+- unify macros
+
+Revision 1.491.2.1  2006/03/26 22:39:41  glen
+- 3.5.2
 
 Revision 1.491  2006/02/11 14:25:32  arekm
 - branch patch updated

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.214 SPECS/kdenetwork.spec:1.215
--- SPECS/kdenetwork.spec:1.214	Sat Apr  1 18:17:41 2006
+++ SPECS/kdenetwork.spec	Sat Apr  1 19:07:57 2006
@@ -9,29 +9,24 @@
 #
 # Conditional build:
 %bcond_without	xmms
-%bcond_without	hidden_visibility	# pass '--fvisibility=hidden'
-					# & '--fvisibility-inlines-hidden'
-					# to g++
+%bcond_without	hidden_visibility	# pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 %bcond_with	skype			# incomplete!
 
 %define		_state		stable
-%define		_kdever		3.5.2
-%define		_ver		3.5.2
-
-%define		_minlibsevr	9:3.5.2
-%define		_minbaseevr	9:3.5.2
-
+%define		_minlibsevr	9:%{version}
+%define		_minbaseevr	9:%{version}
+#
 Summary:	K Desktop Environment - network applications
 Summary(es):	K Desktop Environment - aplicaciones de red
 Summary(pl):	K Desktop Environment - aplikacje sieciowe
 Summary(pt_BR):	K Desktop Environment - aplicaçőes de rede
 Name:		kdenetwork
-Version:	%{_ver}
+Version:	3.5.2
 Release:	1
 Epoch:		10
 License:	GPL
 Group:		X11/Libraries
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	dddc6bb65ffb9e46d118781ca0f26da4
 Source1:	%{name}-kopetestyles.tar.bz2
 # Source1-md5:	642aa6bf71c37c90ce23e3c4c3a90922
@@ -1769,11 +1764,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.215  2006/04/01 17:07:57  glen
+- merge with AC-branch
+
 Revision 1.214  2006/04/01 16:17:41  arekm
 - up to 3.5.2
 
 Revision 1.213  2006/03/20 00:01:37  pluto
 - todo updated.
+
+Revision 1.212.2.2  2006/04/01 17:00:41  glen
+- unify macros
+
+Revision 1.212.2.1  2006/03/28 20:57:10  glen
+- 3.5.2
 
 Revision 1.212  2006/03/02 23:01:11  glen
 - use %service and adapterize
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.499&r2=1.500&f=u
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.214&r2=1.215&f=u