[kdelibs] 4.9.90 (4.10beta2)
Rex Dieter
rdieter at fedoraproject.org
Mon Dec 3 17:39:36 UTC 2012
commit e326136c9b1876da1b9cad84b1e8912f2c86ad66
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Dec 3 11:39:46 2012 -0600
4.9.90 (4.10beta2)
.gitignore | 2 +-
kdelibs-4.6.2-uri_mimetypes.patch | 110 -
kdelibs-4.7.3-halectomy.patch | 104 -
kdelibs-4.9.2-FindSamba_samba4.patch | 28 -
kdelibs-4.9.3-delete-downloadDialog.patch | 10 -
kdelibs-4.9.90-FindSamba_samba4.patch | 26 +
kdelibs-cmake_python3.patch | 29 -
kdelibs-udisks2-backend.patch | 4069 -----------------------------
kdelibs.spec | 61 +-
sources | 2 +-
10 files changed, 41 insertions(+), 4400 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e551b84..429cba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/kdelibs-4.8.5.tar.xz
-/kdelibs-4.9.3.tar.xz
/kdelibs-4.9.4.tar.xz
+/kdelibs-4.9.90.tar.xz
diff --git a/kdelibs-4.9.90-FindSamba_samba4.patch b/kdelibs-4.9.90-FindSamba_samba4.patch
new file mode 100644
index 0000000..636713e
--- /dev/null
+++ b/kdelibs-4.9.90-FindSamba_samba4.patch
@@ -0,0 +1,26 @@
+diff -up kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 kdelibs-4.9.90/cmake/modules/FindSamba.cmake
+--- kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 2012-11-14 09:58:29.000000000 -0600
++++ kdelibs-4.9.90/cmake/modules/FindSamba.cmake 2012-12-03 07:29:54.103057454 -0600
+@@ -17,10 +17,20 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES
+ set(Samba_FIND_QUIETLY TRUE)
+ endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
+
+-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++find_package(PkgConfig)
++pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
+
+-find_library(SAMBA_LIBRARIES NAMES smbclient )
++find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
++ HINTS
++ ${PC_LIBSMBCLIENT_INCLUDEDIR}
++ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
+
++find_library(SAMBA_LIBRARIES NAMES smbclient
++ HINTS
++ ${PC_LIBSMBCLIENT_LIBDIR}
++ ${PC_LIBSMBCLIENT_LIB_DIRS})
+
+ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
+ set(SAMBA_FOUND TRUE)
diff --git a/kdelibs.spec b/kdelibs.spec
index 0a90c8a..b707ecd 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -8,9 +8,6 @@
%define apidocs 1
# to build/include QCH apidocs or not (currently broken)
#define apidocs_qch 1
-%if 0%{?fedora} && 0%{?fedora} > 16
-%define libplasma_pk 1
-%endif
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
%define udisks udisks2
%else
@@ -24,7 +21,7 @@
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Summary: KDE Libraries
-Version: 4.9.4
+Version: 4.9.90
Release: 1%{?dist}
Name: kdelibs
@@ -58,7 +55,6 @@ Requires: kde-settings
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: hunspell
-# https://git.reviewboard.kde.org/r/103028/
Requires: media-player-info
# beware of possible bootstrapping problems
# moved back to kde-runtime
@@ -72,7 +68,7 @@ Requires: strigi-libs%{?_isa} >= %{strigi_version}
# make kdelibs-devel parallel-installable with kdelibs3-devel
Patch0: kdelibs-4.5.80-parallel_devel.patch
-# fix kde#149705
+# fix http://bugs.kde.org/149705
Patch2: kdelibs-4.2.85-kde149705.patch
# install all .css files and Doxyfile.global in kdelibs-common to build
@@ -118,12 +114,6 @@ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
# https://git.reviewboard.kde.org/r/102350/
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
-# make forcefully hal-free build
-Patch45: kdelibs-4.7.3-halectomy.patch
-
-# udisks2 Solid backend
-Patch47: kdelibs-udisks2-backend.patch
-
# cache to improve performance of apps using Solid with udisks2 (#868530)
Patch48: kdelibs-udisks2-kfileplacesdevicecache.patch
@@ -132,10 +122,6 @@ Patch48: kdelibs-udisks2-kfileplacesdevicecache.patch
# https://git.reviewboard.kde.org/r/102439/
Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
-# https://bugs.kde.org/show_bug.cgi?id=269045
-# https://git.reviewboard.kde.org/r/101231/
-Patch51: kdelibs-4.6.2-uri_mimetypes.patch
-
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
@@ -147,22 +133,15 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
# https://git.reviewboard.kde.org/r/106861/
-Patch55: kdelibs-4.9.2-FindSamba_samba4.patch
+Patch55: kdelibs-4.9.90-FindSamba_samba4.patch
# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213)
Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch
-# cmake/python3 love, see # https://bugs.kde.org/show_bug.cgi?id=275919
-# see also http://git.reviewboard.kde.org/r/106707/
-# reviewboard finished, double check if these remaining patches are still
-# required or not -- rex
-Patch58: kdelibs-cmake_python3.patch
-
-# make filter working
+# make filter working, TODO: upstream? -- rex
Patch59: kdelibs-4.9.3-kcm_ssl.patch
## upstream
-Patch100: kdelibs-4.9.3-delete-downloadDialog.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@@ -198,6 +177,8 @@ BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libutempter-devel
+# strictly only a runtime dependency, but makes cmake happier at buildtime too -- rex
+BuildRequires: media-player-info
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(avahi-core)
BuildRequires: pkgconfig(dbusmenu-qt)
@@ -312,32 +293,25 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch27 -p1 -b .no_rpath
# libplasma PackageKit integration
-%if 0%{?libplasma_pk}
-%patch40 -p1 -b .libplasma-pk-0001
+## hrm, seems only 0001 is upstreamed so far, need to poke Kevin why that is. -- rex
+#patch40 -p1 -b .libplasma-pk-0001
%patch41 -p1 -b .libplasma-pk-0002
%patch42 -p1 -b .libplasma-pk-0003
-%endif
%if "%{?udisks}" == "udisks2"
-%patch47 -p1 -b .udisks2backend
%patch48 -p1 -b .kfileplacesdevicescache
-%else
-%patch45 -p1 -b .halectomy
%endif
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
-%patch51 -p1 -b .uri_mimetypes
%patch52 -p1 -b .SOLID_UPNP
%patch53 -p1 -b .kjs-s390
%patch54 -p1 -b .kjs-locale
%patch55 -p1 -b .FindSamba-samba4
%patch56 -p1 -b .FindKipi-libkipi2
-%patch58 -p1 -b .cmake_python3
%patch59 -p1 -b .filter
# upstream patches
-%patch100 -p1 -b .delete-downloadDialog
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@@ -352,10 +326,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} \
+ -DKAUTH_BACKEND:STRING="PolkitQt-1" \
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \
- %if 0%{?rhel} > 6 || 0%{?fedora} > 17
- -DWITH_SOLID_UDISKS2:BOOL=ON \
- %endif
+ %{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \
..
popd
@@ -391,10 +364,6 @@ ln -s %{_kde4_libexecdir}/kmailservice %{buildroot}%{_kde4_bindir}/kmailservice
# create/own stuff
# see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
-%if 0%{?fedora} && 0%{?fedora} < 15
-# moved to kde-filesystem f15+
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/plugins/{gui_platform,styles}
-%endif
## use ca-certificates' ca-bundle.crt, symlink as what most other
## distros do these days (http://bugzilla.redhat.com/521902)
@@ -466,11 +435,6 @@ update-desktop-database -q &> /dev/null
update-mime-database %{_kde4_datadir}/mime >& /dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%clean
-rm -rf %{buildroot}
-
-
%files
%doc AUTHORS README TODO
%doc COPYING.LIB
@@ -575,9 +539,7 @@ rm -rf %{buildroot}
%{_mandir}/man1/preparetips.1*
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
-%if 0%{?libplasma_pk}
%{_kde4_bindir}/plasma-dataengine-depextractor
-%endif
%{_kde4_bindir}/kde4-doxygen.sh
%{_kde4_appsdir}/cmake/
%{_kde4_includedir}/*
@@ -596,6 +558,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.9.90-1
+- 4.9.90 (4.10beta2)
+
* Mon Dec 03 2012 Than Ngo <than at redhat.com> - 6:4.9.4-1
- 4.9.4
- update udisks2 backend patch to fix ghost devices
diff --git a/sources b/sources
index cc25efd..8b634ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec4b28e42cdcb26ddba1c1075e02a166 kdelibs-4.9.4.tar.xz
+94c892cbe5eaf180ad18cba7c6d225be kdelibs-4.9.90.tar.xz
More information about the scm-commits
mailing list