|
|
@@ -2,13 +2,13 @@
|
|
|
%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
|
|
|
|
|
|
%define kde_major_version 3
|
|
|
-%define apidocs 1
|
|
|
+%define apidocs 0
|
|
|
|
|
|
Summary: KDE 3 Libraries
|
|
|
Summary(ja): KDE 3 ライブラリ
|
|
|
Name: kdelibs3
|
|
|
Version: 3.5.10
|
|
|
-Release: 6%{?_dist_release}
|
|
|
+Release: 7%{?_dist_release}
|
|
|
|
|
|
License: LGPLv2
|
|
|
URL: http://www.kde.org/
|
|
|
@@ -45,10 +45,14 @@ 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 inotify_* functions which are defined in glibc-header
|
|
|
+Patch54: kdelibs-3.5.10-inotify.patch
|
|
|
# update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
|
|
|
Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
|
|
|
+# fix ftbfs (#631195)
|
|
|
+Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
|
|
|
+# fix FTBFS (cups-util.c must include stdio.h, #714133)
|
|
|
+Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
|
|
|
|
|
|
# Other patches
|
|
|
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
|
|
@@ -72,6 +76,12 @@ Patch120: kzip.cpp.diff
|
|
|
# RH patches (do we need this patch in KDE3 environment like Vine Linux 4.x?)
|
|
|
Patch121: kdelibs-3.4.0-menu.patch
|
|
|
|
|
|
+## Trinity backports
|
|
|
+# build fix for CUPS 1.6 by Timothy Pearson, backported by Kevin Kofler
|
|
|
+# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=9bc0d2cd9d38750658770e69bf0445dc5162beb7
|
|
|
+# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=91bf63b43bf4cc9ff640bd3c11549644cef05e6e
|
|
|
+Patch150: kdelibs-3.5.10-cups16.patch
|
|
|
+
|
|
|
## security fixes
|
|
|
# fix CVE-2009-2537 - select length DoS
|
|
|
Patch200: kdelibs-3.5.10-cve-2009-2537-select-length.patch
|
|
|
@@ -89,9 +99,23 @@ Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
|
|
|
Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
|
|
|
# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
|
|
|
Patch207: libltdl-CVE-2009-3736.patch
|
|
|
+# CVE-2011-3365, input validation failure in KSSL
|
|
|
+Patch208: kdelibs-3.5.x-CVE-2011-3365.patch
|
|
|
+# CVE-2013-2074, prints passwords contained in HTTP URLs in error messages
|
|
|
+Patch209: kdelibs-3.5.10-CVE-2013-2074.patch
|
|
|
# fix CVE-2006-4811 (former Patch2)
|
|
|
Patch220: kdelibs-3.5.5-khtml-overflow-CVE-2006-4811.patch
|
|
|
|
|
|
+## fixes to common KDE 3 autotools machinery
|
|
|
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
|
|
|
+Patch300: kde3-acinclude.patch
|
|
|
+# remove flawed and obsolete automake version check in admin/cvs.sh
|
|
|
+Patch301: kde3-automake-version.patch
|
|
|
+# fix build failure with automake 1.13: add the --add-missing --copy flags
|
|
|
+# also add --force-missing to get aarch64 support (#925029/#925627)
|
|
|
+Patch302: kde3-automake-add-missing.patch
|
|
|
+
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: cups-devel >= 1.1.12
|
|
|
BuildRequires: qt-devel >= 3.3.2
|
|
|
@@ -109,7 +133,6 @@ BuildRequires: aspell-devel libidn-devel
|
|
|
BuildRequires: OpenEXR-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: avahi-devel
|
|
|
-BuildRequires: gamin-devel
|
|
|
BuildRequires: enchant-devel
|
|
|
%if %{?_dist_release} != "vl4"
|
|
|
BuildRequires: libICE-devel libSM-devel
|
|
|
@@ -130,7 +153,7 @@ Requires: alsa-lib
|
|
|
Requires: vine-menus
|
|
|
Requires: nss-mdns
|
|
|
Requires: hicolor-icon-theme
|
|
|
-Requires: kde-settings
|
|
|
+#Requires: kde-settings
|
|
|
Requires: kdelibs-common
|
|
|
|
|
|
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
|
|
@@ -212,8 +235,10 @@ format for easy browsing
|
|
|
%patch51 -p1 -b .cupsserverbin
|
|
|
%patch52 -p1 -b .KDE3
|
|
|
%patch53 -p1 -b .drkonqi-kde4
|
|
|
-%patch54 -p1 -b .flock-redefinition
|
|
|
+%patch54 -p1 -b .inotify
|
|
|
%patch55 -p1 -b .latex-syntax
|
|
|
+%patch56 -p1 -b .qcolor_gcc_ftbfs
|
|
|
+%patch57 -p1 -b .cups-util
|
|
|
|
|
|
%patch100 -p1 -b .kstandarddirs
|
|
|
%patch101 -p1 -b .libtool-shlibext
|
|
|
@@ -223,13 +248,15 @@ format for easy browsing
|
|
|
%patch107 -p1 -b .assert
|
|
|
%patch108 -p1 -b .alias
|
|
|
%patch109 -p1 -b .kabc
|
|
|
-%patch110 -p1 -b .autoconf
|
|
|
+#patch110 -p1 -b .autoconf
|
|
|
%patch111 -p1 -b .kde-config_kde-version
|
|
|
pushd kio/kio
|
|
|
%patch120 -p0
|
|
|
popd
|
|
|
#patch121 -p1
|
|
|
|
|
|
+%patch150 -p1 -b .cups16
|
|
|
+
|
|
|
# security fixes
|
|
|
%patch200 -p1 -b .cve-2009-2537
|
|
|
%patch201 -p0 -b .cve-2009-1725
|
|
|
@@ -239,16 +266,15 @@ popd
|
|
|
%patch205 -p1 -b .cve-2009-2702
|
|
|
%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
|
|
|
%patch207 -p1 -b .CVE-2009-3736
|
|
|
+%patch208 -p1 -b .CVE-2011-3365
|
|
|
+%patch209 -p1 -b .CVE-2013-2074
|
|
|
%patch220 -p1 -b .CVE-2006-4811
|
|
|
|
|
|
-# Make the version number say what it should say
|
|
|
-perl -pi -e 's,#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING "%{version}-%{release}",g' kdecore/kdeversion.h
|
|
|
-
|
|
|
-# hack/fix for newer automake
|
|
|
-sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
|
|
|
+%patch300 -p1 -b .acinclude
|
|
|
+%patch301 -p1 -b .automake-version
|
|
|
+%patch302 -p1 -b .automake-add-missing
|
|
|
make -f admin/Makefile.common cvs
|
|
|
|
|
|
-
|
|
|
%build
|
|
|
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
|
|
|
|
|
@@ -267,17 +293,20 @@ export DO_NOT_COMPILE="libkscreensaver"
|
|
|
--disable-rpath \
|
|
|
--enable-new-ldflags \
|
|
|
--disable-dependency-tracking \
|
|
|
- --disable-debug --disable-warning --enable-final \
|
|
|
+ --disable-debug --disable-warnings --enable-final \
|
|
|
--disable-fast-malloc \
|
|
|
%if "%{_lib}" == "lib64"
|
|
|
--enable-libsuffix="64" \
|
|
|
%endif
|
|
|
--with-qt-libraries=$QTDIR/lib \
|
|
|
--with-extra-includes=%{_includedir}/avahi-compat-libdns_sd \
|
|
|
- --enable-pie \
|
|
|
+ --enable-cups \
|
|
|
--enable-mitshm \
|
|
|
+ --enable-pie \
|
|
|
+ --enable-sendfile \
|
|
|
--enable-dnotify \
|
|
|
--enable-inotify \
|
|
|
+ --disable-libfam \
|
|
|
--with-acl \
|
|
|
--with-alsa \
|
|
|
--with-utempter \
|
|
|
@@ -286,9 +315,13 @@ export DO_NOT_COMPILE="libkscreensaver"
|
|
|
--with-libart \
|
|
|
--with-jasper \
|
|
|
--with-openexr \
|
|
|
- --with-aspell \
|
|
|
+ --without-aspell \
|
|
|
--without-hspell \
|
|
|
- --with-distribution=VineLinux
|
|
|
+ --with-distribution="$(cat /etc/vine-release 2>/dev/null)"
|
|
|
+
|
|
|
+# kill rpath harder, inspired by https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
|
|
|
+# other more standard variants didnt work or caused other problems
|
|
|
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
|
|
|
|
|
|
%if %{apidocs}
|
|
|
# make KDE API documentation
|
|
|
@@ -542,6 +575,13 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 30 2014 Ryoichi INAGAKI <ryo1@toki.wakwak.jp> 3.5.10-7
|
|
|
+- rebuilt on current VineSeed
|
|
|
+- added Patch 56, 57, 150, 208, 209, 300, 301 and 302 from FC
|
|
|
+- updated Patch54 from FC
|
|
|
+- dropt apidocs subpackage
|
|
|
+- removed kde-settings dependency
|
|
|
+
|
|
|
* Thu Mar 24 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-6
|
|
|
- rebuilt with openssl-1.0.0d, krb5-libs-1.8.2 and cups-1.4.6
|
|
|
- added R: kdelibs-common
|
inagaki