rpms/kdelibs3/devel kdelibs-3.5.9-fix-flock-redefinition.patch, NONE, 1.1 kdelibs3.spec, 1.38, 1.39

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-fix-flock-redefinition.patch 
Log Message:
* 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:36:02.000000000 +0200
@@ -71,6 +71,7 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
+#define _ASM_GENERIC_FCNTL_H
 #include <linux/inotify.h>
 
 static inline int inotify_init (void)


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdelibs3.spec	22 Aug 2008 22:12:49 -0000	1.38
+++ kdelibs3.spec	22 Aug 2008 22:40:19 -0000	1.39
@@ -31,7 +31,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -81,6 +81,8 @@
 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
@@ -263,6 +265,7 @@
 %if "%{name}" != "kdelibs"
 %patch53 -p1 -b .drkonqi-kde4
 %endif
+%patch54 -p1 -b .flock-redefinition
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -622,6 +625,9 @@
 
 
 %changelog
+* 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