jreznik pushed to kdelibs3 (epel7). "- fix build against Rawhide kernel headers (fix flock and flock64 (..more)"

[notifications at fedoraproject.org]

>From 8da90eb8fe806a7e8e2ee7974fbf17a3c7b93337 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler at fedoraproject.org>
Date: Fri, 22 Aug 2008 22:40:19 +0000
Subject: - fix build against Rawhide kernel headers (fix flock and flock64    
 redefinition)


diff --git a/kdelibs-3.5.9-fix-flock-redefinition.patch b/kdelibs-3.5.9-fix-flock-redefinition.patch
new file mode 100644
index 0000000..1934424
--- /dev/null
+++ b/kdelibs-3.5.9-fix-flock-redefinition.patch
@@ -0,0 +1,11 @@
+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)
diff --git a/kdelibs3.spec b/kdelibs3.spec
index ce0f3b2..4dd3170 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -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 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch
 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 @@ format for easy browsing
 %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 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=8da90eb8fe806a7e8e2ee7974fbf17a3c7b93337