RPM: update packages for Fedora 29

7 files changed, 23 insertions, 10 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index c248b34e5..49e769162 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -797,7 +797,7 @@ endif
 
 hk_classes:
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
 	$(call buildpkg,extras/hk_classes)
 endif
 
@@ -821,7 +821,7 @@ kdissert:
 
 klamav:
 # Not on Fedora >= 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
 	$(call buildpkg,extras/klamav)
 endif
 
@@ -833,7 +833,7 @@ endif
 
 knoda: hk_classes
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
 	$(call buildpkg,extras/knoda)
 endif
 
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 5bc2c6e88..fd33e5a7a 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -110,7 +110,7 @@ Requires(postun): coreutils
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29
 Requires:		wodim
 REquires:		genisoimage
 %else
diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec
index cf71c5928..ef07ce73c 100644
--- a/redhat/applications/knetstats/knetstats-14.0.0.spec
+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec
@@ -145,7 +145,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %defattr(-,root,root,-)
 %{tde_bindir}/knetstats
 %{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
+%{tde_datadir}/apps/knetstats/
 %{tde_tdedocdir}/HTML/en/knetstats/
 %{tde_datadir}/icons/hicolor/*/apps/knetstats.png
 
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 02cd9c010..7feefff45 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -83,8 +83,12 @@ Provides:		trinity-knetworkmanager = %{version}-%{release}
 # NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-BuildRequires:	NetworkManager-devel
 Requires:		NetworkManager
+%if 0%{?fedora} >= 29
+BuildRequires:	NetworkManager-libnm-devel
+%else
+BuildRequires:		NetworkManager-devel
+%endif
 %else
 Requires:		NetworkManager-gnome
 %endif
@@ -94,9 +98,13 @@ Requires:		networkmanager
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 %if 0%{?pclinuxos} == 0
+%if 0%{?fedora} >= 29
+BuildRequires:	NetworkManager-libnm-devel
+%else
 BuildRequires:	NetworkManager-glib-devel
 %endif
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	NetworkManager-devel
 Requires:		NetworkManager
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index b9d293309..272b099d5 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -161,11 +161,12 @@ chmod -x example/*
   -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
   -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
 
+#  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
 %__sed -i "designer/designer.pro" \
-  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
   -e "s|# DESTDIR|DESTDIR|"
 
 export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 ( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
 ( cd designer; tqmake )
 
@@ -179,6 +180,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
 %endif
 
+export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 %__make %{?_smp_mflags} -C qt
 %__make %{?_smp_mflags} -C designer
 
@@ -186,6 +189,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 unset QTDIR QTINC QTLIB
 export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 %__rm -rf $RPM_BUILD_ROOT
 
 # Installs the QT part
@@ -202,7 +206,7 @@ for i in doc/html/*; do
 done
 
 # Installs the Designer plugin
-for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do
+for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
   [ -r "${i}" ] || continue
   %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
 done
@@ -212,6 +216,7 @@ done
 %__mv -f tmplib/* %{buildroot}%{_libdir}
 
 # Fix private headers location
+%__mkdir_p %{buildroot}%{_includedir}
 %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
 
diff --git a/redhat/docker/fedora32.sh b/redhat/docker/fedora32.sh
index 823b27fbc..860dc15d5 100755
--- a/redhat/docker/fedora32.sh
+++ b/redhat/docker/fedora32.sh
@@ -13,7 +13,7 @@ setarch i686 sudo dnf install \
   --disablerepo="*" --enablerepo="fedora,updates" \
   --nodocs \
   --assumeyes \
-  @core bash vim
+  @core bash vim yum-plugin-ovl
 
 sudo sed -i "${INSTALLROOT}/etc/yum.repos.d/"*".repo" \
          -e "s|\$basearch|i386|g" \
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index 94434b8ed..ca5d13cd8 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -95,7 +95,7 @@ BuildRequires: ocaml
 
 # KIG python scripting support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29
 %define with_kig 0
 %else
 %define with_kig 1