|
@@ -13,7 +13,7 @@
|
|
Summary: KDE Libraries
|
|
Summary: KDE Libraries
|
|
Summary(ja): KDE ライブラリ
|
|
Summary(ja): KDE ライブラリ
|
|
Name: kdelibs
|
|
Name: kdelibs
|
|
-Version: 4.9.3
|
|
+Version: 4.9.5
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
License: LGPLv2+
|
|
License: LGPLv2+
|
|
@@ -44,7 +44,7 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
|
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
|
Patch12: kdelibs-4.1.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.5.80-libexecdir.patch
|
|
+Patch14: kdelibs-4.8.0-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.6.90-kstandarddirs.patch
|
|
@@ -61,6 +61,14 @@ Patch24: kdelibs-4.3.1-drkonq.patch
|
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
|
Patch27: kdelibs-4.5.80-no_rpath.patch
|
|
Patch27: kdelibs-4.5.80-no_rpath.patch
|
|
|
|
|
|
|
|
+# udisks2 Solid backend
|
|
|
|
+Patch47: kdelibs-udisks2-backend.patch
|
|
|
|
+
|
|
|
|
+# limit solid qDebug spam
|
|
|
|
+# http://bugzilla.redhat.com/882731
|
|
|
|
+# TODO: could make uptreamable and conditional only on Release-type builds
|
|
|
|
+Patch49: kdelibs-solid_qt_no_debug_output.patch
|
|
|
|
+
|
|
## upstreamable
|
|
## upstreamable
|
|
# knewstuff2 variant of:
|
|
# knewstuff2 variant of:
|
|
# https://git.reviewboard.kde.org/r/102439/
|
|
# https://git.reviewboard.kde.org/r/102439/
|
|
@@ -70,23 +78,24 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
|
|
# https://git.reviewboard.kde.org/r/101231/
|
|
# https://git.reviewboard.kde.org/r/101231/
|
|
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
|
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
|
|
|
|
|
-# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
|
|
+# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
|
-# attachment (patch by Andrea Iacovitti)
|
|
+Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
|
|
-# https://bugs.kde.org/show_bug.cgi?id=277457#c2
|
|
+
|
|
-Patch52: kdelibs-4.6.95-khtml-kde#277457.patch
|
|
+# return valid locale (RFC 1766)
|
|
|
|
+Patch54: kdelibs-4.8.4-kjs-locale.patch
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+# make filter working
|
|
|
|
+Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
|
|
|
|
|
## upstream
|
|
## upstream
|
|
|
|
+# FindKdcraw.cmake fixes
|
|
|
|
+Patch100: kdelibs-FindKdcraw.patch
|
|
|
|
|
|
## security fix
|
|
## security fix
|
|
# Not Upstreamed? why not ? -- Rex
|
|
# Not Upstreamed? why not ? -- Rex
|
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
|
|
|
|
|
-## Fedora specific patches
|
|
|
|
-# make forcefully hal-free build
|
|
|
|
-Patch300: kdelibs-4.6.80-halectomy.patch
|
|
|
|
-
|
|
|
|
-## Vine patches
|
|
|
|
-Patch400: kdelibs-4.7.2-pulseaudio-1.0.patch
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRequires: alsa-lib-devel
|
|
BuildRequires: alsa-lib-devel
|
|
@@ -152,7 +161,7 @@ Requires: soprano >= %{soprano_ver}
|
|
Requires: strigi-libs >= %{strigi_ver}
|
|
Requires: strigi-libs >= %{strigi_ver}
|
|
Requires: docbook-dtds docbook-style-xsl
|
|
Requires: docbook-dtds docbook-style-xsl
|
|
Requires: kde-l10n-ja
|
|
Requires: kde-l10n-ja
|
|
-Requires: upower udisks
|
|
+Requires: upower udisks2
|
|
|
|
|
|
Requires(post): shared-mime-info, desktop-file-utils, coreutils, gtk2
|
|
Requires(post): shared-mime-info, desktop-file-utils, coreutils, gtk2
|
|
Requires(postun): shared-mime-info, desktop-file-utils, coreutils, gtk2
|
|
Requires(postun): shared-mime-info, desktop-file-utils, coreutils, gtk2
|
|
@@ -258,20 +267,22 @@ API ドキュメントを含んでいます.
|
|
#patch24 -p1 -b .drkonq
|
|
#patch24 -p1 -b .drkonq
|
|
%patch27 -p1 -b .no_rpath
|
|
%patch27 -p1 -b .no_rpath
|
|
|
|
|
|
|
|
+%patch47 -p1 -b .udisks2backend
|
|
|
|
+%patch49 -p1 -b .solid_qt_no_debug_output
|
|
|
|
+
|
|
# upstreamable patches
|
|
# upstreamable patches
|
|
%patch50 -p1 -b .knewstuff_gpg2
|
|
%patch50 -p1 -b .knewstuff_gpg2
|
|
%patch51 -p1 -b .uri_mimetypes
|
|
%patch51 -p1 -b .uri_mimetypes
|
|
|
|
+%patch52 -p1 -b .SOLID_UPNP
|
|
|
|
+%patch54 -p1 -b .kjs-locale
|
|
|
|
+%patch59 -p1 -b .filter
|
|
|
|
|
|
# upstream patches
|
|
# upstream patches
|
|
|
|
+%patch100 -p1 -b .FindKdcraw
|
|
|
|
|
|
# security fix
|
|
# security fix
|
|
%patch200 -p1 -b .CVE-2009-2702
|
|
%patch200 -p1 -b .CVE-2009-2702
|
|
|
|
|
|
-# Fedora patches
|
|
|
|
-%patch300 -p1 -b .halectomy
|
|
|
|
-
|
|
|
|
-# Vine patches
|
|
|
|
-#patch400 -p1 -b .pa10
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
|
|
@@ -289,6 +300,7 @@ PATH=$PATH:%{_prefix}/kerberos/bin \
|
|
-DHUPNP_INCLUDE_DIR:PATH=%{_qt4_headerdir} \
|
|
-DHUPNP_INCLUDE_DIR:PATH=%{_qt4_headerdir} \
|
|
-DHUPNP_LIBS=%{_qt4_libdir}/libHUpnp.so \
|
|
-DHUPNP_LIBS=%{_qt4_libdir}/libHUpnp.so \
|
|
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Vine" \
|
|
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Vine" \
|
|
|
|
+ -DWITH_SOLID_UDISKS2:BOOL=ON \
|
|
..
|
|
..
|
|
popd
|
|
popd
|
|
|
|
|
|
@@ -467,6 +479,19 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
|
|
%doc %{_docdir}/HTML/en/kdelibs4-apidocs
|
|
%doc %{_docdir}/HTML/en/kdelibs4-apidocs
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Jan 02 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.5-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add Patches from fedora
|
|
|
|
+ - Patch47 (kdelibs-udisks2-backend.patch)
|
|
|
|
+ - Patch49 (kdelibs-solid_qt_no_debug_output.patch)
|
|
|
|
+ - Patch52 (kdelibs-4.7.4-SOLID_UPNP.patch)
|
|
|
|
+ - Patch54 (kdelibs-4.8.4-kjs-locale.patch)
|
|
|
|
+ - Patch59 (kdelibs-4.9.3-kcm_ssl.patch)
|
|
|
|
+ - Patch100 (kdelibs-4.7.4-SOLID_UPNP.patch)
|
|
|
|
+- update Patch14 (kdelibs-4.8.0-libexecdir.patch)
|
|
|
|
+- remove Patch52 (kdelibs-4.6.95-khtml-kde#277457.patch)
|
|
|
|
+- remove Patch300 (kdelibs-4.6.80-halectomy.patch)
|
|
|
|
+
|
|
* Wed Nov 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.3-1
|
|
* Wed Nov 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.3-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|