redhat/Makefile.r14

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14

index c248b34..49e7691 100644

--- a/redhat/Makefile.r14

+++ b/redhat/Makefile.r14

@@ -797,7 +797,7 @@

 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 @@

 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 @@

 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

redhat/applications/k

diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec

index 5bc2c6e..fd33e5a 100644

--- a/redhat/applications/k3b/k3b-14.0.0.spec

+++ b/redhat/applications/k3b/k3b-14.0.0.spec

@@ -110,7 +110,7 @@

 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

redhat/applications/knetstats/knetstats-14.0.0.spec

diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec

index cf71c59..ef07ce7 100644

--- a/redhat/applications/knetstats/knetstats-14.0.0.spec

+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec

@@ -145,7 +145,7 @@

 %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

redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec

diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec

index 02cd9c0..7feefff 100644

--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec

+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec

@@ -83,8 +83,12 @@

 # 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 @@

 %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

redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec

diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec

index b9d2933..272b099 100644

--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec

+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec

@@ -161,11 +161,12 @@

   -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 @@

 %__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 @@

 %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 @@

 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 @@

 %__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

redhat/docker/fedora32.sh

diff --git a/redhat/docker/fedora32.sh b/redhat/docker/fedora32.sh

index 823b27f..860dc15 100755

--- a/redhat/docker/fedora32.sh

+++ b/redhat/docker/fedora32.sh

@@ -13,7 +13,7 @@

   --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" \

redhat/main/tdeedu/tdeedu-14.0.0.spec

diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec

index 94434b8..ca5d13c 100644

--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec

+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec

@@ -95,7 +95,7 @@

 # 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

redhat/build/gather_rpm_sources.sh

diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh

index 98b67cb..f6b7253 100755

--- a/redhat/build/gather_rpm_sources.sh

+++ b/redhat/build/gather_rpm_sources.sh

@@ -1,8 +1,7 @@

-#!/bin/bash

+#!/bin/bash -x

-# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]

-# Example: build_rpm_package.sh tdebase 14.0.0

-

+# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>

+# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase

 PKGNAME="${1%/}"

 PKGNAME="${PKGNAME##*/}"

@@ -31,7 +30,7 @@

 ### Check for patches

-PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}"

+PATCHDIR="${HOME}/tde/tde-patches/${TDE_VERSION}/$1"

 if [ -d "${PATCHDIR}" ]; then

   cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch"

   sed -i "${TARGETDIR}/"*".spec" \

redhat/buildenv.sh

diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh

index 02f4e19..029f29a 100644

--- a/redhat/buildenv.sh

+++ b/redhat/buildenv.sh

@@ -4,11 +4,11 @@

 TDE_BASEDIR=~/tde

 [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"

-TDE_GITBASESRC=${TDE_BASEDIR}/tde_master

-TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat

+TDE_GITBASESRC=${TDE_BASEDIR}/tde.master

+TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat

 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}

-[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging

+[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master

 export PATH="${PATH}:${TDE_GITBASEPKG}/build"

redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch

diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch

deleted file mode 100644

index f6a362d..0000000

--- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch

+++ /dev/null

@@ -1,14 +0,0 @@

---- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI	2013-07-29 21:52:57.859615464 +0200

-+++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h	2013-07-29 21:57:19.206481299 +0200

-@@ -43,7 +43,11 @@

- #else

- typedef int (*av_find_stream_info_t)(AVFormatContext *);

- #endif

-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0)

-+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);

-+#else

- typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);

-+#endif

- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)

- typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);

- #else

redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch

diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch

deleted file mode 100644

index f7858c0..0000000

--- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch

+++ /dev/null

@@ -1,11 +0,0 @@

---- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI	2013-06-17 20:59:49.620929488 +0200

-+++ trinity-k9copy-3.5.13.2/src/Makefile.am	2013-06-17 21:00:11.150425671 +0200

-@@ -35,7 +35,7 @@

- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \

- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \

- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \

--	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL)

-+	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice

- 

- # this is where the desktop file will go 

- shelldesktopdir = $(kde_appsdir)/Utilities

redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch

diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch

deleted file mode 100644

** Diff limit reached (max: 250 lines) **