[PATCH] KDE 3.3.2 (UPD: kdewebdev, kdemultimedia; NEW: kdegraphics, kdeutils)

[Michal Kochanowicz]

Nowe update'y do 3.3.2
	kdegraphics
	kdeutils

Poprawki do wcześniej podesłanych:
	kdemultimedia: dodane brakujace jeszcze od czasów 3.3.0 Obsoletes.
	kdewebdev: Release: 1

To zamyka listę używanych przeze mnie pakietów z KDE.

-- 
--= Michal Kochanowicz =--==--==BOFH==--==--= michal w michal.waw.pl =--
--= finger me for PGP public key or visit http://michal.waw.pl/PGP =--
--==--==--==--==--==-- Vodka. Connecting people.--==--==--==--==--==--
A chodzenie po górach SSIE!!!
-------------- następna część ---------
Index: kdegraphics.spec
===================================================================
RCS file: /cvsroot/SPECS/kdegraphics.spec,v
retrieving revision 1.136
diff -u -r1.136 kdegraphics.spec
--- kdegraphics.spec	12 Nov 2004 22:24:34 -0000	1.136
+++ kdegraphics.spec	12 Dec 2004 19:29:19 -0000
@@ -1,10 +1,10 @@
 # $Revision: 1.136 $, $Date: 2004/11/12 22:24:34 $
 
 %define		_state		stable
-%define		_ver		3.3.1
+%define		_ver		3.3.2
 
-%define		_minlibsevr	9:3.3.1
-%define		_minbaseevr	9:3.3.1
+%define		_minlibsevr	9:3.3.2
+%define		_minbaseevr	9:3.3.2
 
 Summary:	K Desktop Environment - Graphic Applications
 Summary(es):	K Desktop Environment - aplicaciones gráficas
@@ -12,14 +12,13 @@
 Summary(pt_BR):	K Desktop Environment - Aplicaçőes gráficas
 Name:		kdegraphics
 Version:	%{_ver}
-Release:	2
+Release:	1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	18f063ec6fad27b304ae97cf4b480140
+# Source0-md5:	03092b8be2f7054d71895b8fd58ad26e
 # Source0-size:	6419816
-Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 BuildRequires:	ed
 BuildRequires:	fribidi-devel >= 0.10.4
@@ -523,7 +522,6 @@
 
 %prep
 %setup -q
-%patch100 -p1
 %patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Graphics;Viewer;/' \
-------------- następna część ---------
Index: kdeutils.spec
===================================================================
RCS file: /cvsroot/SPECS/kdeutils.spec,v
retrieving revision 1.138
diff -u -r1.138 kdeutils.spec
--- kdeutils.spec	12 Nov 2004 22:24:34 -0000	1.138
+++ kdeutils.spec	12 Dec 2004 19:32:28 -0000
@@ -1,10 +1,10 @@
 # $Revision: 1.138 $, $Date: 2004/11/12 22:24:34 $
 
 %define		_state		stable
-%define		_ver		3.3.1
+%define		_ver		3.3.2
 
-%define		_minlibsevr	9:3.3.1
-%define		_minbaseevr	9:3.3.1
+%define		_minlibsevr	9:3.3.2
+%define		_minbaseevr	9:3.3.2
 
 Summary:	K Desktop Environment - utilities
 Summary(pl):	K Desktop Environment - narzędzia
@@ -16,15 +16,14 @@
 Summary(zh_CN):	KDEĘľÓĂš¤žß
 Name:		kdeutils
 Version:	%{_ver}
-Release:	3
+Release:	1
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
 Icon:		kde-utils.xpm
 Source0:        ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	07e45ca924cc52ce5565bb0bf3f6fa6a
+# Source0-md5:	bf50db108408da11e2f2fcacd6b46b51
 # Source0-size:	2208385
-Patch100:	%{name}-branch.diff
 Patch0:		%{name}-kdf-label.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -532,7 +531,6 @@
 
 %prep
 %setup -q
-%patch100 -p1
 %patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
-------------- następna część ---------
Index: kdemultimedia.spec
===================================================================
RCS file: /cvsroot/SPECS/kdemultimedia.spec,v
retrieving revision 1.182
diff -u -r1.182 kdemultimedia.spec
--- kdemultimedia.spec	14 Nov 2004 08:55:50 -0000	1.182
+++ kdemultimedia.spec	12 Dec 2004 19:29:51 -0000
@@ -5,24 +5,23 @@
 %bcond_without	xine	# build without xine support
 
 %define		_state		stable
-%define		_ver		3.3.1
+%define		_ver		3.3.2
 
-%define		_minlibsevr	9:3.3.1
-%define		_minbaseevr	9:3.3.1
+%define		_minlibsevr	9:3.3.2
+%define		_minbaseevr	9:3.3.2
 
 Summary:	K Desktop Environment - multimedia applications
 Summary(pl):	K Desktop Environment - aplikacje multimedialne
 Name:		kdemultimedia
 Version:	%{_ver}
-Release:	3
+Release:	1
 Epoch:		9
 License:	GPL
 Vendor:		The KDE Team
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{_ver}.tar.bz2
-# Source0-md5:	4a3462ba7b37e0057eadd24541908f95
+# Source0-md5:	2f393da809542dab5bf75bf7a91d1ec0
 # Source0-size:	5362949
-Patch100:	%{name}-branch.diff
 Patch0:		%{name}-llh.patch
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 BuildRequires:	arts-qt-devel
@@ -45,6 +44,7 @@
 BuildRequires:	flac-devel
 BuildRequires:	libmad-devel
 BuildRequires:	zlib-devel
+Obsoletes:	%{name}-libworkman
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -480,7 +480,6 @@
 
 %prep
 %setup -q 
-#%patch100 -p1
 %patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Audio;Player;/' \
-------------- następna część ---------
Index: kdewebdev.spec
===================================================================
RCS file: /cvsroot/SPECS/kdewebdev.spec,v
retrieving revision 1.36
diff -u -r1.36 kdewebdev.spec
--- kdewebdev.spec	2 Nov 2004 08:49:34 -0000	1.36
+++ kdewebdev.spec	12 Dec 2004 19:08:15 -0000
@@ -1,22 +1,21 @@
 # $Revision: 1.36 $, $Date: 2004/11/02 08:49:34 $
 %define		_state		stable
-%define		_ver		3.3.1
+%define		_ver		3.3.2
 
-%define		_minlibsevr	9:3.3.1
-%define		_minbaseevr	9:3.3.1
+%define		_minlibsevr	9:3.3.2
+%define		_minbaseevr	9:3.3.2
 Summary:	Web development tools for KDE
 Summary(es):	Uno editor WEB para KDE
 Summary(pl):	Narzędzia do tworzenia WWW dla KDE
 Summary(pt_BR):	Um editor web para o KDE
 Name:		kdewebdev
 Version:	%{_ver}
 Release:	1
 Epoch:		2
 License:	GPL
 Group:		X11/Development/Tools
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_ver}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	b4178f3cadaa33befb6a0f98fbbb99c1
-Patch100:	%{name}-branch.diff
+# Source0-md5:	582d0f3073d5829b4ab21b03411ba697
 Patch0:		%{name}-quanta.patch
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1.6.1
@@ -267,7 +266,6 @@
 
 %prep
 %setup -q
-%patch100 -p1
 %patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Development;WebDevelopment;/' \