rpms/kdelibs3/F-9 kdelibs-3.5.9-fix-flock-redefinition.patch, NONE, 1.1 kdelibs3.spec, 1.31, 1.32 kdelibs-3.5.6-137675.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30050/F-9

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-fix-flock-redefinition.patch 
Removed Files:
	kdelibs-3.5.6-137675.patch 
Log Message:
Sync from devel:

* 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)

kdelibs-3.5.9-fix-flock-redefinition.patch:

--- NEW FILE kdelibs-3.5.9-fix-flock-redefinition.patch ---
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:59:17.000000000 +0200
@@ -71,7 +71,11 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
+#define flock linux_flock
+#define flock64 linux_flock64
 #include <linux/inotify.h>
+#undef flock
+#undef flock64
 
 static inline int inotify_init (void)
 {


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdelibs3.spec	22 Aug 2008 22:01:30 -0000	1.31
+++ kdelibs3.spec	2 Sep 2008 17:09:24 -0000	1.32
@@ -1,15 +1,22 @@
 # kdelibs3 review: http://bugzilla.redhat.com/248899
 
+%define _default_patch_fuzz 2
+
 %define distname "Fedora"
 
 %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}
@@ -28,8 +35,8 @@
 %define include_crystalsvg 1
 
 Summary: K Desktop Environment 3 - Libraries
-Version: 3.5.9
-Release: 17%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -79,21 +86,20 @@
 Patch52: kdelibs-3.5.9-KDE3.patch
 # use /usr/libexec/kde4/drkonqi in KCrash (#453243)
 Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
+# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
 # kget ignores simultaneous download limit (kde #101956)
 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
@@ -128,8 +134,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
@@ -207,7 +213,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}
@@ -261,13 +267,12 @@
 %if "%{name}" != "kdelibs"
 %patch53 -p1 -b .drkonqi-kde4
 %endif
+%patch54 -p1 -b .flock-redefinition
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-%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
 
@@ -620,6 +625,12 @@
 
 
 %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)
+
 * Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
 - fix logic error in OnlyShowIn=KDE3 patch
 


--- kdelibs-3.5.6-137675.patch DELETED ---