|
@@ -13,7 +13,7 @@
|
|
Summary: KDE Libraries
|
|
Summary: KDE Libraries
|
|
Summary(ja): KDE ライブラリ
|
|
Summary(ja): KDE ライブラリ
|
|
Name: kdelibs
|
|
Name: kdelibs
|
|
-Version: 4.9.5
|
|
|
|
|
|
+Version: 4.10.4
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
License: LGPLv2+
|
|
License: LGPLv2+
|
|
@@ -22,47 +22,45 @@ URL: http://www.kde.org/
|
|
|
|
|
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.xz
|
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.xz
|
|
|
|
|
|
|
|
+
|
|
# make kdelibs-devel parallel-installable with kdelibs3-devel
|
|
# make kdelibs-devel parallel-installable with kdelibs3-devel
|
|
-Patch0: kdelibs-4.5.80-parallel_devel.patch
|
|
|
|
|
|
+Patch0: kdelibs-4.9.95-parallel_devel.patch
|
|
|
|
|
|
-# fix kde#149705
|
|
|
|
-Patch2: kdelibs-4.2.85-kde149705.patch
|
|
|
|
|
|
+# fix http://bugs.kde.org/149705
|
|
|
|
+Patch2: kdelibs-4.10.0-kde149705.patch
|
|
|
|
|
|
# install all .css files and Doxyfile.global in kdelibs-common to build
|
|
# install all .css files and Doxyfile.global in kdelibs-common to build
|
|
# kdepimlibs-apidocs against
|
|
# kdepimlibs-apidocs against
|
|
Patch8: kdelibs-4.3.90-install_all_css.patch
|
|
Patch8: kdelibs-4.3.90-install_all_css.patch
|
|
|
|
|
|
-# add Fedora/V-R to KHTML UA string
|
|
|
|
-Patch9: kdelibs-4.6.80-branding.patch
|
|
|
|
-
|
|
|
|
-# don't cache kdeglobals paths because they change after profile directories
|
|
|
|
-# are loaded from kde4rc
|
|
|
|
-Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
|
|
|
-
|
|
|
|
# adds the Administration menu from redhat-menus which equals System + Settings
|
|
# adds the Administration menu from redhat-menus which equals System + Settings
|
|
# This prevents the stuff getting listed twice, under both System and Settings.
|
|
# This prevents the stuff getting listed twice, under both System and Settings.
|
|
-Patch12: kdelibs-4.1.0-xdg-menu.patch
|
|
|
|
|
|
+Patch12: kdelibs-4.10.0-xdg-menu.patch
|
|
|
|
|
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
|
-Patch14: kdelibs-4.8.0-libexecdir.patch
|
|
|
|
|
|
+Patch14: kdelibs-4.9.97-libexecdir.patch
|
|
|
|
|
|
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
|
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
|
-Patch18: kdelibs-4.6.90-kstandarddirs.patch
|
|
|
|
|
|
+Patch18: kdelibs-4.10.0-kstandarddirs.patch
|
|
|
|
|
|
# set build type
|
|
# set build type
|
|
-Patch20: kdelibs-4.1.70-cmake.patch
|
|
|
|
-
|
|
|
|
-# disable drkonqi by default, RHEL prefers/wants abrt
|
|
|
|
-Patch24: kdelibs-4.3.1-drkonq.patch
|
|
|
|
|
|
+Patch20: kdelibs-4.10.0-cmake.patch
|
|
|
|
|
|
# die rpath die, since we're using standard paths, we can avoid
|
|
# die rpath die, since we're using standard paths, we can avoid
|
|
# this extra hassle (even though cmake is *supposed* to not add standard
|
|
# this extra hassle (even though cmake is *supposed* to not add standard
|
|
# paths (like /usr/lib64) already! With this, we can drop
|
|
# paths (like /usr/lib64) already! With this, we can drop
|
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
|
-Patch27: kdelibs-4.5.80-no_rpath.patch
|
|
|
|
|
|
+Patch27: kdelibs-4.10.0-no_rpath.patch
|
|
|
|
+
|
|
|
|
+## libplasma PackageKit integration
|
|
|
|
|
|
-# udisks2 Solid backend
|
|
|
|
-Patch47: kdelibs-udisks2-backend.patch
|
|
|
|
|
|
+# Trigger installation of missing components when installing a package.
|
|
|
|
+# https://git.reviewboard.kde.org/r/102291/
|
|
|
|
+Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
|
|
|
|
+
|
|
|
|
+# Implement automatic scanning of source code for required data engines.
|
|
|
|
+# https://git.reviewboard.kde.org/r/102350/
|
|
|
|
+Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
|
|
|
|
|
# limit solid qDebug spam
|
|
# limit solid qDebug spam
|
|
# http://bugzilla.redhat.com/882731
|
|
# http://bugzilla.redhat.com/882731
|
|
@@ -74,27 +72,44 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch
|
|
# https://git.reviewboard.kde.org/r/102439/
|
|
# https://git.reviewboard.kde.org/r/102439/
|
|
Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
|
|
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)
|
|
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
|
-Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
|
|
|
|
|
|
+Patch52: kdelibs-4.10.0-SOLID_UPNP.patch
|
|
|
|
|
|
# return valid locale (RFC 1766)
|
|
# return valid locale (RFC 1766)
|
|
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
|
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: FindSamba.cmake-help-find-samba4-more-reliably.patch
|
|
|
|
|
|
-# make filter working
|
|
|
|
|
|
+# make filter working, TODO: upstream? -- rex
|
|
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
|
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
|
|
|
|
|
|
|
+# disable dot to reduce apidoc size
|
|
|
|
+Patch61: kdelibs-4.9.3-dot.patch
|
|
|
|
+
|
|
## upstream
|
|
## upstream
|
|
-# FindKdcraw.cmake fixes
|
|
|
|
-Patch100: kdelibs-FindKdcraw.patch
|
|
|
|
|
|
+
|
|
|
|
+# revert these commits for
|
|
|
|
+#https://bugs.kde.org/315578
|
|
|
|
+# for now, causes regression,
|
|
|
|
+#https://bugs.kde.org/317138
|
|
|
|
+Patch090: return-not-break.-copy-paste-error.patch
|
|
|
|
+Patch091: coding-style-fixes.patch
|
|
|
|
+Patch092: return-application-icons-properly.patch
|
|
|
|
|
|
## security fix
|
|
## security fix
|
|
-# Not Upstreamed? why not ? -- Rex
|
|
|
|
-Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
|
|
|
|
|
+
|
|
|
|
+# rhel patches
|
|
|
|
+
|
|
|
|
+# disable webkit
|
|
|
|
+Patch300: kdelibs-4.10.0-webkit.patch
|
|
|
|
+
|
|
|
|
+# set abrt default
|
|
|
|
+Patch301: kdelibs-4.x-abrt.patch
|
|
|
|
+
|
|
|
|
+# vine patch
|
|
|
|
+Patch1001: kdelibs-4.10.4-disable-hal.patch
|
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -137,6 +152,7 @@ BuildRequires: soprano-devel >= %{soprano_ver}
|
|
BuildRequires: strigi-devel >= %{strigi_ver}
|
|
BuildRequires: strigi-devel >= %{strigi_ver}
|
|
BuildRequires: xz-devel
|
|
BuildRequires: xz-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: zlib-devel
|
|
|
|
+BuildRequires: udisks2-devel
|
|
|
|
|
|
BuildRequires: libSM-devel libXcomposite-devel libXdamage-devel
|
|
BuildRequires: libSM-devel libXcomposite-devel libXdamage-devel
|
|
BuildRequires: libxkbfile-devel libXpm-devel libXScrnSaver-devel
|
|
BuildRequires: libxkbfile-devel libXpm-devel libXScrnSaver-devel
|
|
@@ -258,30 +274,40 @@ API ドキュメントを含んでいます.
|
|
%patch0 -p1 -b .parallel_devel
|
|
%patch0 -p1 -b .parallel_devel
|
|
%patch2 -p1 -b .kde149705
|
|
%patch2 -p1 -b .kde149705
|
|
%patch8 -p1 -b .install_all_css
|
|
%patch8 -p1 -b .install_all_css
|
|
-#patch9 -p1 -b .branding
|
|
|
|
-#sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
|
|
|
%patch12 -p1 -b .Administration-menu
|
|
%patch12 -p1 -b .Administration-menu
|
|
%patch14 -p1 -b .libexecdir
|
|
%patch14 -p1 -b .libexecdir
|
|
%patch18 -p1 -b .kstandarddirs
|
|
%patch18 -p1 -b .kstandarddirs
|
|
%patch20 -p1 -b .xxcmake
|
|
%patch20 -p1 -b .xxcmake
|
|
-#patch24 -p1 -b .drkonq
|
|
|
|
%patch27 -p1 -b .no_rpath
|
|
%patch27 -p1 -b .no_rpath
|
|
|
|
|
|
-%patch47 -p1 -b .udisks2backend
|
|
|
|
|
|
+# libplasma PackageKit integration
|
|
|
|
+## hrm, seems only 0001 is upstreamed so far, need to poke Kevin why that is. -- rex
|
|
|
|
+%patch41 -p1 -b .libplasma-pk-0002
|
|
|
|
+%patch42 -p1 -b .libplasma-pk-0003
|
|
|
|
+
|
|
%patch49 -p1 -b .solid_qt_no_debug_output
|
|
%patch49 -p1 -b .solid_qt_no_debug_output
|
|
|
|
|
|
# upstreamable patches
|
|
# upstreamable patches
|
|
-%patch50 -p1 -b .knewstuff_gpg2
|
|
|
|
-%patch51 -p1 -b .uri_mimetypes
|
|
|
|
|
|
+%patch50 -p1 -b .knewstuff2_gpg2
|
|
%patch52 -p1 -b .SOLID_UPNP
|
|
%patch52 -p1 -b .SOLID_UPNP
|
|
%patch54 -p1 -b .kjs-locale
|
|
%patch54 -p1 -b .kjs-locale
|
|
|
|
+%patch55 -p1 -b .FindSamba-samba4
|
|
%patch59 -p1 -b .filter
|
|
%patch59 -p1 -b .filter
|
|
|
|
+%patch61 -p1 -b .dot
|
|
|
|
|
|
# upstream patches
|
|
# upstream patches
|
|
-%patch100 -p1 -b .FindKdcraw
|
|
|
|
|
|
+%patch90 -p1 -R -b .return-not-break.-copy-paste-error
|
|
|
|
+%patch91 -p1 -R -b .coding-style-fixes.patch
|
|
|
|
+%patch92 -p1 -R -b .return-application-icons-properly
|
|
|
|
+
|
|
|
|
+# security fixes
|
|
|
|
|
|
-# security fix
|
|
|
|
-%patch200 -p1 -b .CVE-2009-2702
|
|
|
|
|
|
+# rhel patches
|
|
|
|
+%patch300 -p1 -b .webkit
|
|
|
|
+%patch301 -p1 -b .abrt
|
|
|
|
+
|
|
|
|
+# vine patch
|
|
|
|
+%patch1001 -p1 -b .hal
|
|
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
@@ -419,11 +445,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
%{_libexecdir}/kde4/kio_http_cache_cleaner
|
|
%{_libexecdir}/kde4/kio_http_cache_cleaner
|
|
%{_libexecdir}/kde4/kioslave
|
|
%{_libexecdir}/kde4/kioslave
|
|
%{_libexecdir}/kde4/klauncher
|
|
%{_libexecdir}/kde4/klauncher
|
|
-%{_libexecdir}/kde4/kmailservice
|
|
|
|
# see kio/misc/kpac/README.wpad
|
|
# see kio/misc/kpac/README.wpad
|
|
%attr(4755,root,root) %{_libexecdir}/kde4/kpac_dhcp_helper
|
|
%attr(4755,root,root) %{_libexecdir}/kde4/kpac_dhcp_helper
|
|
%{_libexecdir}/kde4/ksendbugmail
|
|
%{_libexecdir}/kde4/ksendbugmail
|
|
-%{_libexecdir}/kde4/ktelnetservice
|
|
|
|
%{_libexecdir}/kde4/lnusertemp
|
|
%{_libexecdir}/kde4/lnusertemp
|
|
%{_libexecdir}/kde4/start_kdeinit
|
|
%{_libexecdir}/kde4/start_kdeinit
|
|
%{_libexecdir}/kde4/start_kdeinit_wrapper
|
|
%{_libexecdir}/kde4/start_kdeinit_wrapper
|
|
@@ -479,6 +503,37 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
%doc %{_docdir}/HTML/en/kdelibs4-apidocs
|
|
%doc %{_docdir}/HTML/en/kdelibs4-apidocs
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Jun 08 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.10.4-1
|
|
|
|
+- new upstream release
|
|
|
|
+- update patches from fedora
|
|
|
|
+ - Patch0 (kdelibs-4.9.95-parallel_devel.patch)
|
|
|
|
+ - Patch2 (kdelibs-4.10.0-kde149705.patch)
|
|
|
|
+ - Patch12 (kdelibs-4.10.0-xdg-menu.patch)
|
|
|
|
+ - Patch14 (kdelibs-4.9.97-libexecdir.patch)
|
|
|
|
+ - Patch18 (kdelibs-4.10.0-kstandarddirs.patch)
|
|
|
|
+ - Patch20 (kdelibs-4.10.0-cmake.patch)
|
|
|
|
+ - Patch27 (kdelibs-4.10.0-no_rpath.patch)
|
|
|
|
+ - Patch52 (kdelibs-4.10.0-SOLID_UPNP.patch)
|
|
|
|
+- add patches from fedora
|
|
|
|
+ - Patch41 (0002-Trigger-installation-of-missing-components-when-inst.patch)
|
|
|
|
+ - Patch42 (0003-Implement-automatic-scanning-of-source-code-for-requ.patch)
|
|
|
|
+ - Patch55 (FindSamba.cmake-help-find-samba4-more-reliably.patch)
|
|
|
|
+ - Patch61 (kdelibs-4.9.3-dot.patch)
|
|
|
|
+ - Patch90 (return-not-break.-copy-paste-error.patch)
|
|
|
|
+ - Patch91 (coding-style-fixes.patch)
|
|
|
|
+ - Patch92 (return-application-icons-properly.patch)
|
|
|
|
+ - Patch300 (kdelibs-4.10.0-webkit.patch)
|
|
|
|
+ - Patch301 (kdelibs-4.x-abrt.patch)
|
|
|
|
+- remove patches
|
|
|
|
+ - Patch9 (kdelibs-4.6.80-branding.patch)
|
|
|
|
+ - Patch10 (kdelibs-4.1.72-no-cache-kdeglobals-paths.patch)
|
|
|
|
+ - Patch24 (kdelibs-4.3.1-drkonq.patch)
|
|
|
|
+ - Patch47 (kdelibs-udisks2-backend.patch)
|
|
|
|
+ - Patch51 (kdelibs-4.6.2-uri_mimetypes.patch)
|
|
|
|
+ - Patch100 (kdelibs-FindKdcraw.patch)
|
|
|
|
+ - Patch200 (kdelibs-4.3.1-CVE-2009-2702.patch)
|
|
|
|
+- add Patch1001 (kdelibs-4.10.4-disable-hal.patch)
|
|
|
|
+
|
|
* Wed Jan 02 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.5-1
|
|
* Wed Jan 02 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.5-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- add Patches from fedora
|
|
- add Patches from fedora
|
|
@@ -559,7 +614,7 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
- new upstream release
|
|
- new upstream release
|
|
- added BR: dbusmenu-qt-devel
|
|
- added BR: dbusmenu-qt-devel
|
|
|
|
|
|
-* Wed May 4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
|
|
|
|
|
|
+* Tue May 4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- updated spec files for Vine Linux 5/VineSeed
|
|
- updated spec files for Vine Linux 5/VineSeed
|
|
|
|
|
|
@@ -571,7 +626,7 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
- dropt kde4.(sh|csh) (kde-settings provides them)
|
|
- dropt kde4.(sh|csh) (kde-settings provides them)
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|
|
-* Sun Feb 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
|
|
|
|
|
|
+* Thu Feb 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- built with new toolchain
|
|
- built with new toolchain
|
|
|
|
|
|
@@ -1400,7 +1455,7 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
- almost completely rewrite spec file - move to DESTDIR system
|
|
- almost completely rewrite spec file - move to DESTDIR system
|
|
- current snapshot
|
|
- current snapshot
|
|
|
|
|
|
-* Thu Oct 15 1999 Bernhard Rosenkraenzer <bero@redhat.de>
|
|
|
|
|
|
+* Fri Oct 15 1999 Bernhard Rosenkraenzer <bero@redhat.de>
|
|
- 2.0 snapshots
|
|
- 2.0 snapshots
|
|
- Change prefix to respect %{prefix} so we can coexist with KDE 1.x
|
|
- Change prefix to respect %{prefix} so we can coexist with KDE 1.x
|
|
- kdelibs-devel requires kdelibs
|
|
- kdelibs-devel requires kdelibs
|