RHEL/Fedora: updates kdelibs, kdebase, kdeadmin

2 files changed, 76 insertions, 1 deletions

diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_inotify_support.patch b/redhat/kdelibs/kdelibs-3.5.13-add_inotify_support.patch
new file mode 100644
index 000000000..97afbc7a7
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-add_inotify_support.patch
@@ -0,0 +1,67 @@
+commit 24f144faf98249012e7b1657a5dfe93750f0dfde
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326095653 -0600
+
+    Add inotify CMake support to tdelibs
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e26c252..ede0a3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,6 +76,7 @@
+ OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
+ OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
+ OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
++OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
+ 
+ OPTION( WITH_ASPELL "Enable aspell support" OFF )
+ OPTION( WITH_HSPELL "Enable hspell support" OFF )
+@@ -726,6 +727,26 @@ if( WITH_GCC_VISIBILITY )
+   set( HAVE_PCREPOSIX 1 )
+ endif( )
+
++##### check for inotify ###########################
++
++if( WITH_INOTIFY )
++  check_include_file( "inotify.h" INOTIFY_FOUND )
++  check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
++  if( NOT INOTIFY_FOUND )
++    if( NOT INOTIFY_SYS_FOUND )
++      message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
++    endif( NOT INOTIFY_SYS_FOUND )
++  endif( NOT INOTIFY_FOUND )
++  if( INOTIFY_FOUND )
++      set( HAVE_INOTIFY 1 )
++  endif( INOTIFY_FOUND )
++  if( INOTIFY_SYS_FOUND )
++      set( HAVE_INOTIFY 1 )
++      set( HAVE_SYS_INOTIFY 1 )
++  endif( INOTIFY_SYS_FOUND )
++endif( )
++
++
+ ##### check for aspell ##########################
+ # we need ASPELL_DATADIR too
+ 
+diff --git a/config.h.cmake b/config.h.cmake
+index 1893270..d9b0ef5 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -234,7 +234,7 @@
+ #cmakedefine HAVE_INITGROUPS_PROTO 1
+ 
+ /* Define if your system has Linux Inode Notification */
+-#undef HAVE_INOTIFY
++#cmakedefine HAVE_INOTIFY 1
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #cmakedefine HAVE_INTTYPES_H 1
+@@ -555,7 +555,7 @@
+ #cmakedefine HAVE_SYS_FILIO_H 1
+ 
+ /* Define if your system has glibc support for inotify */
+-#undef HAVE_SYS_INOTIFY
++#cmakedefine HAVE_SYS_INOTIFY 1
+ 
+ /* Define to 1 if you have the <sys/mman.h> header file. */
+ #cmakedefine HAVE_SYS_MMAN_H 1
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index b9698c448..ccafc358b 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -44,6 +44,8 @@ Patch10:	kdelibs-3.5.13-maxlinelength.patch
 Patch11:	kdelibs-3.5.13-enable_pcre.patch
 ## [kdelibs/kate] Updated syntax highlighting files [Bug #764]
 Patch12:	kdelibs-3.5.13-kate_syntax.patch.gz
+## [kdelibs] Adds Inotify support (backport from commit 24f144faf98249012e7b1657a5dfe93750f0dfde)
+Patch13:	kdelibs-3.5.13-add_inotify_support.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -117,6 +119,7 @@ format for easy browsing
 %patch10 -p1
 %patch11 -p0
 %patch12 -p1
+%patch13 -p1
 
 
 %build
@@ -144,6 +147,8 @@ cd build
   -DWITH_ASPELL=OFF \
   -DWITH_HSPELL=OFF \
   -DWITH_PCRE=ON \
+  -DWITH_INOTIFY=ON \
+  -DWITH_XTEST=ON \
   ..
 
 %__make %{?_smp_mflags}
@@ -315,6 +320,9 @@ EOF
 
 
 %changelog
+* Sat Jan 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Adds 'inotify' support
+
 * Sat Dec 31 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Enable pcre support in kdelibs [Bug #569]
 - Updated Kate syntax highlighting files [Bug #764]