|
|
@@ -1,17 +1,17 @@
|
|
|
%define pamservice kde
|
|
|
%define gdmsession kde.desktop
|
|
|
%define vine5 %(grep -c 5. /etc/vine-release)
|
|
|
-%define make_cvs 1
|
|
|
|
|
|
Name: kdebase3
|
|
|
Version: 3.5.10
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Release: 5%{?_dist_release}
|
|
|
Summary: KDE 3 core files
|
|
|
Summary(ja): KDE 3 基本ファイル
|
|
|
|
|
|
-Group: User Interface/Desktops
|
|
|
+# programs: GPLv2, libs: LGPLv2
|
|
|
License: GPLv2
|
|
|
URL: http://www.kde.org/
|
|
|
+Group: User Interface/Desktops
|
|
|
|
|
|
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
|
|
|
Source1: konsole.desktop
|
|
|
@@ -57,13 +57,28 @@ Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
|
|
|
Patch36: kdebase-3.5.9-userdiskmount.patch
|
|
|
# don't link kcm_colors against libkrdb (and don't call runRdb)
|
|
|
Patch37: kdebase-3.5.10-libkrdb_dep.patch
|
|
|
+# find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS)
|
|
|
+Patch39: kdebase-3.5.10-samba4.patch
|
|
|
+# remove obsolete MimeType from printmgr/printers.desktop (#587568)
|
|
|
+# patch by Ilya Chernykh from openSUSE
|
|
|
+Patch40: kdebase-3.5.10-printmanager-desktop-fix.patch
|
|
|
+
|
|
|
# http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
|
|
|
Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
|
|
|
Patch101: kdebase-3.5.10-ossl-1.x.patch
|
|
|
-Patch102: arts-acinclude.patch
|
|
|
|
|
|
# security fixes
|
|
|
|
|
|
+# 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
|
|
|
+
|
|
|
+
|
|
|
# Vine patches (700-)
|
|
|
Patch703: kdebase-3.5.5-pamd.patch
|
|
|
Patch705: konsole-3.5.8-final.diff
|
|
|
@@ -71,35 +86,22 @@ Patch706: kdebase-3.5.8-fix_ftbfs_ucred_redefinition.patch
|
|
|
# KDE.gr.jp patches (800-)
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRequires: automake libtool
|
|
|
BuildRequires: kdelibs3-devel >= %{version}
|
|
|
BuildRequires: libxslt-devel libxml2-devel
|
|
|
+BuildRequires: libsmbclient-devel
|
|
|
BuildRequires: pam-devel
|
|
|
BuildRequires: gettext
|
|
|
BuildRequires: perl
|
|
|
BuildRequires: sed
|
|
|
-%if %{make_cvs}
|
|
|
-BuildRequires: automake libtool
|
|
|
-%endif
|
|
|
BuildRequires: pkgconfig
|
|
|
BuildRequires: doxygen
|
|
|
|
|
|
-BuildRequires: arts-devel
|
|
|
-BuildRequires: dbus-devel dbus-qt3-devel hal-devel
|
|
|
BuildRequires: bzip2-devel
|
|
|
BuildRequires: freetype2-devel
|
|
|
BuildRequires: openldap-devel
|
|
|
BuildRequires: cyrus-sasl-devel
|
|
|
BuildRequires: libart_lgpl-devel
|
|
|
-BuildRequires: libraw1394-devel
|
|
|
-BuildRequires: libusb-devel
|
|
|
-BuildRequires: OpenEXR-devel
|
|
|
-BuildRequires: gtk2-devel
|
|
|
-BuildRequires: openssl-devel
|
|
|
-%if %{?_dist_release} == "vl4"
|
|
|
-BuildRequires: samba-libsmbclient-devel >= 3.0.4
|
|
|
-BuildRequires: XOrg-devel XOrg-gl-devel
|
|
|
-%else
|
|
|
-BuildRequires: libsmbclient-devel >= 3.0.4
|
|
|
## X11 support details (xmkmf, bdftopcf)
|
|
|
BuildRequires: xorg-x11-font-utils
|
|
|
BuildRequires: imake
|
|
|
@@ -116,9 +118,12 @@ BuildRequires: libXext-devel
|
|
|
BuildRequires: libXtst-devel
|
|
|
BuildRequires: libXxf86misc-devel
|
|
|
BuildRequires: libxkbfile-devel
|
|
|
-BuildRequires: mesa-libGL-devel mesa-libGLU-devel
|
|
|
-%endif
|
|
|
-BuildRequires: cdparanoia cdparanoia-devel
|
|
|
+
|
|
|
+BuildRequires: libraw1394-devel
|
|
|
+BuildRequires: libusb-devel
|
|
|
+BuildRequires: OpenEXR-devel
|
|
|
+BuildRequires: gtk2-devel
|
|
|
+
|
|
|
|
|
|
Requires: qt >= 3.3.2
|
|
|
Requires: kdelibs3 >= %{version}
|
|
|
@@ -129,14 +134,8 @@ Requires: hicolor-icon-theme
|
|
|
Requires: pm-utils
|
|
|
%endif
|
|
|
|
|
|
-%if %{?_dist_release} == "vl4"
|
|
|
-Requires: XOrg-libs XOrg-xfs xinitrc
|
|
|
-Requires: samba-libsmbclient
|
|
|
-Prereq: XOrg-font-utils
|
|
|
-%else
|
|
|
Requires: xorg-x11-xinit
|
|
|
Requires(post): xorg-x11-font-utils
|
|
|
-%endif
|
|
|
|
|
|
Obsoletes: kdpms kapm kapmd kcmlaptop
|
|
|
Obsoletes: kdebase < %{version}-%{release}
|
|
|
@@ -172,7 +171,7 @@ Kate plugins or KWin styles.
|
|
|
%patch8 -p1 -b .logo
|
|
|
%patch10 -p1 -b .kdestop-konsole
|
|
|
%patch11 -p1 -b .xdg
|
|
|
-%patch13 -p1 -b .dbus
|
|
|
+#patch13 -p1 -b .dbus
|
|
|
%patch14 -p1 -b .kdm-readme
|
|
|
%patch15 -p1 -b .konsole-fonts
|
|
|
%patch18 -p1 -b .klipper
|
|
|
@@ -188,19 +187,17 @@ Kate plugins or KWin styles.
|
|
|
%patch31 -p1 -b .konsolesu-kdesu
|
|
|
%patch36 -p1 -b .userdiskmount
|
|
|
%patch37 -p1 -b .libkrdb_dep
|
|
|
+%patch39 -p1 -b .samba4
|
|
|
+%patch40 -p1 -b .printmanager-desktop
|
|
|
+
|
|
|
%patch100 -p1 -b .minicli-decimal-comma
|
|
|
%patch101 -p1 -b .ossl-1.x
|
|
|
-%patch102 -p1 -b .autoconf
|
|
|
|
|
|
# Vine patches
|
|
|
%patch703 -p1 -b .pamd
|
|
|
%patch705 -p0
|
|
|
%patch706 -p1 -b .ucred
|
|
|
|
|
|
-#tar xjf %{SOURCE100}
|
|
|
-#%patch100 -p0 -b .toc
|
|
|
-#%patch101 -p1 -b .build
|
|
|
-
|
|
|
# security fixes
|
|
|
|
|
|
# hacks to omit stuff that doesn't support DO_NOT_COMPILE
|
|
|
@@ -220,11 +217,11 @@ perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{versi
|
|
|
# add missing icons for package_games_kids
|
|
|
install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
|
|
|
|
|
|
-%if %{make_cvs}
|
|
|
-# hack/fix for newer automake
|
|
|
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
|
|
|
- make -f admin/Makefile.common cvs
|
|
|
-%endif
|
|
|
+%patch300 -p1 -b .acinclude
|
|
|
+%patch301 -p1 -b .automake-version
|
|
|
+%patch302 -p1 -b .automake-add-missing
|
|
|
+make -f admin/Makefile.common cvs
|
|
|
+
|
|
|
|
|
|
%build
|
|
|
# set some default enviroments
|
|
|
@@ -241,9 +238,10 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
|
|
|
%configure \
|
|
|
--with-qt-libraries=$QTDIR/lib \
|
|
|
--enable-new-ldflags \
|
|
|
+ --enable-silent-rules \
|
|
|
--disable-dependency-tracking \
|
|
|
--with-pam=yes \
|
|
|
- --with-kde-pam=kdm \
|
|
|
+ --with-kdm-pam=kdm \
|
|
|
--with-kcp-pam=kcheckpass \
|
|
|
--with-kss-pam=kscreensaver \
|
|
|
--with-libraw1394 \
|
|
|
@@ -256,6 +254,8 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
|
|
|
--sysconfdir=%{_sysconfdir} \
|
|
|
--enable-final \
|
|
|
--disable-debug \
|
|
|
+ --disable-warnings \
|
|
|
+ --without-hal \
|
|
|
--includedir=%{_includedir}/kde
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
@@ -467,6 +467,11 @@ fi
|
|
|
%exclude %{_libdir}/libkdeinit_*.so
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 25 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.5.10-5
|
|
|
+- dropt Patch13 not to built with dbus
|
|
|
+- added Patch39 and 40
|
|
|
+- added Patch300-302 instead of Patch102
|
|
|
+
|
|
|
* Sat Oct 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.10-4
|
|
|
- rebuild with libraw1394-2.1.0
|
|
|
- add BuildRequires: openssl-devel
|
inagaki