build with cmake, update bconds

diff --git a/kdelibs.spec b/kdelibs.spec
index a4965c81cca126921ff777e7f06a8b88febd0cb2..e63d480e4f584bbf8d09d2908d03f2cdc11c3c39 100644 (file)
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -5,17 +5,29 @@
 #        /usr/share/apps/kconf_update
 #
 # Conditional build:
-%bcond_without alsa                    # build without ALSA support
-%bcond_with    arts                    # build with aRts support
+%bcond_without alsa                    # ALSA support
+%bcond_with    arts                    # Build with aRts
 %bcond_with    apidocs                 # don't prepare API documentation
-%bcond_without autoreqdep              # don't care about package name deps generated by rpm
 %bcond_without kerberos5               # disable kerberos
-%bcond_without openexr                 # disable OpenEXR
-%bcond_without hidden_visibility       # no gcc hidden visibility
+%bcond_without openexr                 # Enable OpenEXR support
+%bcond_without jasper          # Enable jasper (jpeg2k) support
+%bcond_without avahi           # Enable AVAHI support
+%bcond_without pcre            # Enable pcre regex support for kjs
+%bcond_without inotify         # Enable inotify support for kio
+%bcond_without gamin           # Enable FAM/GAMIN support
+%bcond_without lzma            # Enable support for LZMA/XZ
+%bcond_with    aspell          # Enable aspell support
+%bcond_without hspell          # Enable hspell support
+%bcond_with    utempter        # Use utempter for utmp management
+%bcond_without libart          # Enable libart support (for SVG icons)
+%bcond_without libidn          # Enable support for libidn
+%bcond_without ssl             # Enable support for SSL
+%bcond_without cups            # Enable CUPS support
+%bcond_without lua             # Enable LUA support
+%bcond_without tiff            # Enable tiff support
+%bcond_without sudo            # Use sudo as backend for kdesu (default is su)
 
-%define                _state          stable
 %define                artsver         13:1.5.10
-
 Summary:       K Desktop Environment 3 libraries
 Summary(es.UTF-8):     K Desktop Environment 3 - bibliotecas
 Summary(ko.UTF-8):     KDE 3 - 라이브러리
@@ -65,20 +77,23 @@ BuildRequires:      acl-devel
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    arts-qt-devel >= %{artsver}}
 %{?with_arts:BuildRequires:    artsc-devel >= %{artsver}}
-BuildRequires: aspell-devel
+%{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: audiofile-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1.6.1
 BuildRequires: boost-devel >= 1.35.0
 BuildRequires: bzip2-devel
+BuildRequires: cmake >= 2.8
 BuildRequires: cups-devel >= 1:1.3.0
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: fam-devel
-%{?with_hidden_visibility:BuildRequires:       gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
 BuildRequires: gettext-devel
+BuildRequires: libstdc++-devel >= 5:4.1.0-0.20051206r108118.1
+BuildRequires: libtqtinterface-devel >= %{version}
+%{?with_utempter:BuildRequires:        libutempter-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 # <sys/inotify.h>
@@ -106,17 +121,12 @@ BuildRequires:    openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel >= 3.5
 BuildRequires: pkgconfig
 BuildRequires: qt-devel >= 6:3.3.3-4
-%{?with_hidden_visibility:BuildRequires:       qt-devel >= 6:3.3.5.051113-1}
+BuildRequires: qt-devel >= 6:3.3.5.051113-1
 %{?with_apidocs:BuildRequires: qt-doc}
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.129
 #BuildRequires:        unsermake >= 040511
 BuildRequires: zlib-devel
-%if %{with autoreqdep}
-BuildConflicts:        kdebase-core < 9:3.4.0
-BuildConflicts:        kdepim-korganizer-libs
-BuildConflicts:        kdepim-libkdepim < 3:3.3.0
-%endif
 %{?with_arts:Requires: arts >= %{artsver}}
 Requires:      cups-lib >= 1:1.3.0
 Requires:      docbook-dtd412-xml
@@ -373,7 +383,7 @@ strony innych użytkowników lokalnych.
 %patch17 -p1
 #%patch18 -p1 assume outdated
 %patch19 -p1
-#%patch20 -p1 # MERGE WITH lib_loader.patch 
+#%patch20 -p1 # MERGE WITH lib_loader.patch
 #%patch21 -p1 seems outdated
 
 #mv -f configure{,.dist}
@@ -384,45 +394,42 @@ cp -a %{SOURCE5} kio/kssl/kssl/cacert.pem
 echo 'cacert.pem' >> kio/kssl/kssl/localcerts
 
 %build
-# merge cacert root certificate
-cd kio/kssl/kssl
-./mergelocal
-cd -
-
-cp /usr/share/automake/config.sub admin
-export kde_htmldir=%{_kdedocdir}
-export kde_libs_htmldir=%{_kdedocdir}
-if [ ! -f configure ]; then
-       %{__make} -f admin/Makefile.common cvs
-fi
-
-export path_sudo=/usr/bin/sudo
-%configure \
-       --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-       %{!?debug:--disable-rpath} \
-       --disable-final \
-       %{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
-%if "%{_lib}" == "lib64"
-       --enable-libsuffix=64 \
-%endif
-       --enable-mitshm \
-       --with%{!?with_alsa:out}-alsa \
-       --with%{!?with_arts:out}-arts \
-       --with-distribution="PLD Linux Distribution" \
-       --with-ldap=no \
-       --with-lua-includes=%{_includedir}/lua50 \
-       --with-qt-libraries=%{_libdir} \
-       --with-sudo-kdesu-backend
+export QTDIR=%{_prefix}
+
+install -d build
+cd build
+
+%cmake \
+       -DWITH_ALL_OPTIONS=ON \
+       -DWITH_ARTS=O%{!?with_arts:FF}%{?with_arts:N} \
+       %{?with_alsa:-DWITH_ALSA=ON} \
+       -DWITH_LIBART=ON \
+       -DWITH_LIBIDN=ON \
+       -DWITH_SSL=ON \
+       -DWITH_CUPS=ON \
+       -DWITH_LUA=OFF \
+       -DWITH_TIFF=ON \
+       -DWITH_SUDO_KDESU_BACKEND=ON \
+       %{?with_jasper:-DWITH_JASPER=ON} \
+       %{?with_openexr:-DWITH_OPENEXR=ON} \
+       -DWITH_UTEMPTER=O%{!?with_utempter:FF}%{?with_utempter:N} \
+       %{?with_avahi:-DWITH_AVAHI=ON} \
+       %{!?with_pcre:-DWITH_PCRE=OFF} \
+       %{!?with_inotify:-DWITH_INOTIFY=OFF} \
+       %{!?with_gamin:-DWITH_GAMIN=OFF} \
+       -DWITH_SUDO_KDESU_BACKEND=OFF \
+       %{!?with_lzma:-DWITH_LZMA=OFF} \
+       -DWITH_ASPELL=O%{!?with_aspell:FF}%{?with_aspell:N} \
+       %{!?with_hspell:-DWITH_HSPELL=OFF} \
+       ..
 
 %{__make}
-%{?with_apidocs:%{__make} apidox}
-rm -f makeinstall.stamp
 
 %install
 if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
        rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
 
-       %{__make} install \
+       %{__make} install -C build \
                DESTDIR=$RPM_BUILD_ROOT \
                kde_htmldir=%{_kdedocdir}
                kde_libs_htmldir=%{_kdedocdir}