rpms/kdelibs3/devel .cvsignore, 1.4, 1.5 kdelibs3.spec, 1.39, 1.40 sources, 1.4, 1.5 kdelibs-3.5.5-lib_loader-1.2.patch, 1.1, NONE kdelibs-3.5.9-kate-regression.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13883

Modified Files:
	.cvsignore kdelibs3.spec sources 
Removed Files:
	kdelibs-3.5.5-lib_loader-1.2.patch 
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Feb 2008 14:57:22 -0000	1.4
+++ .cvsignore	26 Aug 2008 18:47:44 -0000	1.5
@@ -1 +1 @@
-kdelibs-3.5.9.tar.bz2
+kdelibs-3.5.10.tar.bz2


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdelibs3.spec	22 Aug 2008 22:40:19 -0000	1.39
+++ kdelibs3.spec	26 Aug 2008 18:47:44 -0000	1.40
@@ -7,11 +7,16 @@
 %define kde_settings 1 
 
 %define arts 1
-%define arts_epoch 8
-%define arts_version 1.5.9
+%define arts_ev 8:1.5.9
 
-%define qt3_epoch 1
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3_epoch 1:
+%define qt3 qt
+%endif
 %define qt3_version 3.3.8b
+%define qt3_ev %{?qt3_epoch}%{qt3_version} 
 # unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
 #global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
 %define qt3_ver %{qt3_version}
@@ -30,8 +35,8 @@
 %define include_crystalsvg 1
 
 Summary: K Desktop Environment 3 - Libraries
-Version: 3.5.9
-Release: 18%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -94,10 +99,9 @@
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
-Patch200: kdelibs-3.5.9-kate-regression.patch
 
-#{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-#Requires: qt3 >= %{qt3_epoch}:%{qt3_ver}
+#{?arts:Requires: arts >= %{arts_ev}}
+#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -132,8 +136,8 @@
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
-BuildRequires: qt3-devel qt3-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
+BuildRequires: %{qt3}-devel %{qt3}-devel-docs
+%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -211,7 +215,7 @@
 Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt3-devel
+Requires: %{qt3}-devel
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
@@ -269,10 +273,9 @@
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
+#patch102 -p0 -b .kde#137675
 
 # upstream patches
-%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -625,6 +628,9 @@
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
+- kde-3.5.10
+
 * Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
 - fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Feb 2008 14:57:22 -0000	1.4
+++ sources	26 Aug 2008 18:47:44 -0000	1.5
@@ -1 +1 @@
-55e5f00874933d1a7ba7c95e369a205e  kdelibs-3.5.9.tar.bz2
+43cd55ed15f63b5738d620ef9f9fd568  kdelibs-3.5.10.tar.bz2


--- kdelibs-3.5.5-lib_loader-1.2.patch DELETED ---


--- kdelibs-3.5.9-kate-regression.patch DELETED ---