Branch: r14.0.x

23f87f90 2019-03-18 19:57:03 François Andriot 
RPM: update build scripts for TDE R14.0.6
A redhat/applications/tdedocker/tdedocker.spec
A redhat/applications/tdeio-gopher/tdeio-gopher.spec
M redhat/Makefile.r14
M redhat/applications/kbibtex/kbibtex.spec
M redhat/applications/kcmldap/kcmldap.spec
M redhat/applications/keximdb/keximdb.spec
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/kooldock/kooldock.spec
M redhat/applications/kvirc/kvirc-14.0.0.spec
M redhat/applications/rosegarden/rosegarden-14.0.0.spec
M redhat/applications/tastymenu/tastymenu.spec
M redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
M redhat/docker/f29/packages
M redhat/docker/oss150/Dockerfile.x86_64
M redhat/docker/oss150/packages
M redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
M redhat/main/tdebase/tdebase.spec
M redhat/main/tdebindings/tdebindings-14.0.0.spec

redhat/Makefile.r14

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 2cfd493..c0f5315 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -25,7 +25,7 @@
 dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tdedocker tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb
 
@@ -688,6 +688,9 @@
 tastymenu:	tdebase pytdeextensions
 	$(call buildpkg,applications/tastymenu)
 
+tdedocker:	tdebase
+	$(call buildpkg,applications/tdedocker)
+
 tde-guidance:	tdebase pytdeextensions
 	$(call buildpkg,applications/tde-guidance)
 
@@ -696,6 +699,9 @@
 
 tdeio-ftps:	tdebase
 	$(call buildpkg,applications/tdeio-ftps)
+
+tdeio-gopher:	tdebase
+	$(call buildpkg,applications/tdeio-gopher)
 
 tdeio-locate:	tdebase
 	$(call buildpkg,applications/tdeio-locate)
@@ -721,13 +727,13 @@
 tderadio:	tdebase
 	$(call buildpkg,applications/tderadio)
 
-tde-style-baghira:
+tde-style-baghira: tdebase
 	$(call buildpkg,applications/tde-style-baghira)
 
-tde-style-domino:
+tde-style-domino: tdebase
 	$(call buildpkg,applications/tde-style-domino)
 
-tde-style-ia-ora:
+tde-style-ia-ora: tdebase
 	$(call buildpkg,applications/tde-style-ia-ora)
 
 tde-style-lipstik:	tdebase
@@ -820,8 +826,8 @@
 	$(call buildpkg,extras/kdissert)
 
 klamav:
-# Not on Fedora >= 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
+# Not on RHEL7, Fedora >= 27, Opensuse TW
+ifeq (,$(filter $(DIST),.el7 .fc27 .fc28 .fc29 .oss150 .osstw))
 	$(call buildpkg,extras/klamav)
 endif

redhat/applications/kbibtex/kbibtex.spec

diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index a9c9001..9148c5f 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.spec
@@ -80,7 +80,9 @@
 BuildRequires:	libxslt-devel
 
 # YAZ support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	libyaz-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}

redhat/applications/kcmldap/kcmldap.spec

diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index cd637b6..5fcf25a 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.spec
@@ -71,6 +71,15 @@
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -170,19 +179,6 @@
 
 
 %build
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
-  extra_includes="%{_includedir}/openldap24:${extra_includes}"
-  extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
-fi
-
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -211,6 +207,12 @@
   -DBUILD_ALL=ON \
   -DBUILD_DOC=ON \
   -DBUILD_TRANSLATIONS=ON \
+  \
+%if 0%{?suse_version}
+  -DKRB5_FOUND=1 \
+  -DKRB5_LIBRARIES="-lkrb5" \
+  -DKRB5_INCLUDE_DIRS="/usr/include" \
+%endif
   ..
 
 %__make %{?_smp_mflags} || %__make

redhat/applications/kexim

diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec
index c7c0c98..6627c48 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/keximdb/keximdb.spec
@@ -133,7 +133,7 @@
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean

redhat/applications/kmymoney/kmymoney-14.0.0.spec

diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index da0e97e..7ad17a3 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -207,9 +207,8 @@
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-# Fix strange FTBFS on RHEL4
-%if 0%{?rhel} == 4
-grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
+%if 0%{?fedora} >= 29
+LDFLAGS="-Wl,--allow-shlib-undefined"
 %endif
 
 # Warning: --enable-final causes FTBFS

redhat/applications/kooldock/kooldock.spec

diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
index 5d0635d..647d511 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/kooldock/kooldock.spec
@@ -62,7 +62,7 @@
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -103,32 +103,37 @@
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -136,7 +141,7 @@
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -173,14 +178,10 @@
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/128x128/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/16x16/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/32x32/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/64x64/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
** Diff limit reached (max: 250 lines) **