From 05e981f0b89c0130808952da8dda4aff1d7d25a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 31 Jan 2021 21:05:16 +0100 Subject: [PATCH] RPM: more updates --- redhat/.gitignore | 1 - redhat/Makefile | 2 +- redhat/applications/basket/basket.spec | 2 +- redhat/applications/bibletime/bibletime.spec | 2 +- redhat/applications/kcmldap/kcmldap.spec | 12 ++-- .../kcmldapcontroller/kcmldapcontroller.spec | 12 ++-- .../kcmldapmanager/kcmldapmanager.spec | 12 ++-- .../kerberostray/kerberostray.spec | 12 ++-- redhat/applications/kgtk-qt3/kgtk-qt3.spec | 3 + .../applications/mathemagics/mathemagics.spec | 2 +- redhat/build/build_rpm_package.sh | 4 +- redhat/build/configure_repository.sh | 2 +- redhat/build/gather_rpm_sources.sh | 4 +- redhat/build/get_installed_package_version.sh | 2 +- .../get_latest_built_package_filename.sh | 2 +- .../build/get_latest_built_package_version.sh | 2 +- redhat/build/get_latest_tarball_filename.sh | 2 +- redhat/build/get_latest_tarball_version.sh | 2 +- redhat/build/get_source_files.sh | 2 +- redhat/build/get_spec_version.sh | 2 +- redhat/build/get_specfile.sh | 2 +- redhat/build/is_latest_package_built.sh | 2 +- redhat/build/is_latest_package_installed.sh | 2 +- redhat/build/update_repository.sh | 2 +- redhat/dependencies/tqca-tls/tqca-tls.spec | 1 + redhat/dependencies/tqt3/tqt3.spec | 6 +- .../tqtinterface/tqtinterface.spec | 1 - redhat/docker/build.sh | 2 +- redhat/docker/el8/Dockerfile.x86_64 | 45 +-------------- redhat/docker/el8/packages | 12 ++++ redhat/docker/el8/rpmmacros | 2 + redhat/docker/f33/packages | 1 + redhat/docker/f33/rpmmacros | 2 + redhat/docker/mga7/rpmmacros | 2 + redhat/docker/pull.sh | 2 +- redhat/docker/push.sh | 2 +- redhat/docker/remove.sh | 2 +- redhat/docker/run.sh | 2 +- .../brp-check-trinity-14.0.0.spec | 2 +- redhat/extras/fileshareset/fileshareset.spec | 2 +- .../trinity-desktop-14.0.0.spec | 2 +- .../trinity-filesystem-14.0.0.spec | 2 +- redhat/libraries/libtdeldap/libtdeldap.spec | 12 ++-- redhat/libraries/libtqt-perl/libtqt-perl.spec | 2 +- redhat/main/tdeaddons/tdeaddons.spec | 1 - redhat/main/tdebase/tdebase.spec | 4 +- redhat/main/tdegames/tdegames.spec | 55 +++++++++++++++++++ redhat/main/tdenetwork/tdenetwork.spec | 4 +- redhat/main/tdeutils/tdeutils.spec | 2 +- 49 files changed, 148 insertions(+), 114 deletions(-) delete mode 100644 redhat/.gitignore diff --git a/redhat/.gitignore b/redhat/.gitignore deleted file mode 100644 index af26df847..000000000 --- a/redhat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/*/patches diff --git a/redhat/Makefile b/redhat/Makefile index 76bc9bf25..323d174b1 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.7}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.0}) TDE_GIT_DIR := $(shell cd ../../tde; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec index 99cc3f21b..3f805ace3 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/basket/basket.spec @@ -131,7 +131,7 @@ fi -DWITH_ALL_OPTIONS="ON" \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec index 2efbcfb47..4ecd291ea 100644 --- a/redhat/applications/bibletime/bibletime.spec +++ b/redhat/applications/bibletime/bibletime.spec @@ -124,7 +124,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?fedora} >= 31 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11" %endif diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec index 5fd5cef1e..499214d7e 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/kcmldap/kcmldap.spec @@ -105,12 +105,12 @@ BuildRequires: openldap24-libs-devel #BuildRequires: krb5-devel # HEIMDAL support -#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -#BuildRequires: heimdal-devel -#%endif -#%if 0%{?suse_version} -#BuildRequires: libheimdal-devel -#%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: heimdal-devel +%endif +%if 0%{?suse_version} +BuildRequires: libheimdal-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index ab08b1b53..981d26b4c 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -95,12 +95,12 @@ BuildRequires: openldap24-libs-devel #BuildRequires: krb5-devel # HEIMDAL support -#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -#BuildRequires: heimdal-devel -#%endif -#%if 0%{?suse_version} -#BuildRequires: libheimdal-devel -#%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: heimdal-devel +%endif +%if 0%{?suse_version} +BuildRequires: libheimdal-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index 4cb87cddd..49cf11bcd 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -92,12 +92,12 @@ BuildRequires: openldap24-libs-devel #BuildRequires: krb5-devel # HEIMDAL support -#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -#BuildRequires: heimdal-devel -#%endif -#%if 0%{?suse_version} -#BuildRequires: libheimdal-devel -#%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: heimdal-devel +%endif +%if 0%{?suse_version} +BuildRequires: libheimdal-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index 7e91e0c72..9b1efc299 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -92,12 +92,12 @@ BuildRequires: openldap24-libs-devel #BuildRequires: krb5-devel # HEIMDAL support -#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -#BuildRequires: heimdal-devel -#%endif -#%if 0%{?suse_version} -#BuildRequires: libheimdal-devel -#%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: heimdal-devel +%endif +%if 0%{?suse_version} +BuildRequires: libheimdal-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index 0f5e282f7..c05e7fb8e 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -180,8 +180,11 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" %{tde_bindir}/kgtk-wrapper %{tde_bindir}/kgtk2-wrapper %{tde_bindir}/kqt3-wrapper +%dir %{tde_datadir}/kgtk +%dir %{tde_libdir}/kgtk %{tde_libdir}/kgtk/libkgtk2.so %{tde_libdir}/kgtk/libkqt3.so %{tde_datadir}/kgtk/preload + %changelog diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index 22ccdd35b..698810832 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -1,5 +1,5 @@ # -# spec file for package mathemagics (version R14.0.0) +# spec file for package mathemagics (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 5f4d659a2..3e4699cd6 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex # Usage: build_rpm_package.sh [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.0.7 +# Example: build_rpm_package.sh tdebase 14.1.0 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" PATH="$(cd $(dirname $0); pwd):${PATH}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 7723a1651..cc9a33e54 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -TDE_VERSION="${1:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.1.0}}" ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 6159a2bf0..9f421e770 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,11 +1,11 @@ #!/bin/bash # Usage: gather_rpm_sources.sh -# Example: gather_rpm_sources.sh tdebase 14.0.7 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.1.0 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 83db3ab12..b89f9bb7f 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Sample package name: trinity-tdelibs-14.0.7-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.1.0-0_pre727+6be06b3d.mga3.opt PKGNAME="${1##*/}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index c25897907..3f7dca3b1 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -2,7 +2,7 @@ PKGNAME="$1" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index 869efc93b..ee4514725 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="$1" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 1d129843f..c3f971c0b 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index dd3448765..36090ef86 100755 --- a/redhat/build/get_latest_tarball_version.sh +++ b/redhat/build/get_latest_tarball_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 8b2a74c1a..d6c43b0e4 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index d92060c5c..529b11593 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index 62eb01144..4f5dec5b2 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 2acb98a6a..336a83cc3 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})" TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 811cbafa0..fe2d948b9 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index d6b711656..c00078f1e 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -1,7 +1,7 @@ #!/bin/bash WORKERS=$(getconf _NPROCESSORS_ONLN) -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 3f5d9d109..3022051ec 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -57,6 +57,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 0.9.8 diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index daa0c8f29..2d63b6548 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -1270,7 +1270,7 @@ echo "sle_version = %{?sle_version}" # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ - -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \ + -e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \ -e "s|\$(QTDIR)|/usr|g" \ -e "s|-lqt|-ltqt|g" \ -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \ @@ -1281,8 +1281,8 @@ echo "sle_version = %{?sle_version}" -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \ -e "s|^QMAKE_MOC =.*|QMAKE_MOC = %{_bindir}/tqmoc|" \ -e "s|^QMAKE_UIC =.*|QMAKE_UIC = %{_bindir}/tquic|" \ - -e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \ - -e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|" \ + -e "s|^QMAKE_INCDIR_TQT =.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \ + -e "s|^QMAKE_LIBDIR_TQT =.*|QMAKE_LIBDIR_TQT = %{_libdir}|" \ %build diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 5d873b86a..4a01a16a9 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -18,7 +18,6 @@ # BUILD WARNING: # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! -%global # TDE variables %define tde_epoch 2 diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 21f1385e5..945ce4751 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index f252b37e8..090d63f9d 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -20,7 +20,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && dnf -y install epel-release \ && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \ && dnf -y install dnf-plugins-core \ - && dnf config-manager --enable PowerTools \ + && dnf config-manager --enable powertools \ && dnf -y --enableplugin=ovl install $(= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %global debug_package %{nil} %endif diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index 21f6d26a4..f540aee6a 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -16,7 +16,7 @@ # %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index dc4ab5cdb..9eef80818 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 6d72b713e..081f6f047 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -96,12 +96,12 @@ BuildRequires: openldap24-libs-devel %endif # HEIMDAL support -#%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -#BuildRequires: heimdal-devel -#%endif -#%if 0%{?suse_version} -#BuildRequires: libheimdal-devel -#%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: heimdal-devel +%endif +%if 0%{?suse_version} +BuildRequires: libheimdal-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 738884fe6..76c5b0b79 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec @@ -166,7 +166,7 @@ export PATH="%{tde_bindir}:${PATH}" # Unwanted files %__rm -f %{buildroot}%{perl_archlib}/perllocal.pod %__rm -f %{buildroot}%{perl_vendorarch}/auto/TQt/.packlist -chmod u+w %{buildroot}%{perl_archlib}/vendor_perl/auto/TQt/TQt.so + %clean %__rm -rf %{buildroot} diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index accb5bca5..19d665a60 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -465,7 +465,6 @@ graphical disk usage viewer and image conversions and transformations. %{_sysconfdir}/trinity/translaterc %{tde_bindir}/fsview %{tde_bindir}/jpegorient -%{tde_bindir}/tdeio_media_realfolder %{tde_tdelibdir}/konq_sidebarnews.la %{tde_tdelibdir}/konq_sidebarnews.so %{tde_tdelibdir}/konqsidebar_delicious.la diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 0683fd7be..a3953c6e3 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -1486,9 +1486,7 @@ TDE applications, particularly those in the TDE base module. %{tde_libdir}/libtdeinit_kxkb.la %{tde_libdir}/libtdeinit_kxkb.so %{tde_libdir}/libkhotkeys_shared.so.* -%if "%{?tde_version}" == "14.1.0" %{tde_tdeappdir}/kdcop.desktop -%endif %{tde_tdeappdir}/keyboard.desktop %{tde_tdeappdir}/keyboard_layout.desktop %{tde_tdeappdir}/khotkeys.desktop @@ -2304,7 +2302,7 @@ already. Most users won't need this. /usr/lib/X11/displaymanagers/tdm %endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 -#/usr/lib/systemd/system/tdm.service +/usr/lib/systemd/system/tdm.service %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %{_datadir}/xsessions/tde.desktop diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index fd249f8ca..ac18a1835 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -32,6 +32,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -156,6 +157,7 @@ Requires: trinity-ktron = %{version}-%{release} Requires: trinity-ktuberling = %{version}-%{release} Requires: trinity-twin4 = %{version}-%{release} Requires: trinity-lskat = %{version}-%{release} +Requires: trinity-tdefifteen = %{version}-%{release} %description @@ -189,6 +191,7 @@ TDE desktop. %defattr(-,root,root,-) %{tde_datadir}/cmake/libtdegames.cmake %{tde_libdir}/pkgconfig/libtdegames.pc +%{tde_mandir}/man*/atlantik.* ########## @@ -325,6 +328,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/kasteroids/ %{tde_datadir}/config.kcfg/kasteroids.kcfg %{tde_tdedocdir}/HTML/en/kasteroids/ +%{tde_mandir}/man*/kasteroids.* ########## @@ -347,6 +351,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/katomic.desktop %{tde_bindir}/katomic %{tde_tdedocdir}/HTML/en/katomic/ +%{tde_mandir}/man*/katomic.* ########## @@ -371,6 +376,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png %{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png %{tde_tdedocdir}/HTML/en/kbackgammon/ +%{tde_mandir}/man*/kbackgammon.* ########## @@ -394,6 +400,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kbattleship.desktop %{tde_bindir}/kbattleship %{tde_tdedocdir}/HTML/en/kbattleship/ +%{tde_mandir}/man*/kbattleship.* ########## @@ -418,6 +425,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kblackbox.desktop %{tde_bindir}/kblackbox %{tde_tdedocdir}/HTML/en/kblackbox/ +%{tde_mandir}/man*/kblackbox.* ########## @@ -452,6 +460,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/kbounce.png %{tde_bindir}/kbounce %{tde_tdedocdir}/HTML/en/kbounce/ +%{tde_mandir}/man*/kbounce.* ########## @@ -478,6 +487,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kenolaba.desktop %{tde_bindir}/kenolaba %{tde_tdedocdir}/HTML/en/kenolaba/ +%{tde_mandir}/man*/kenolaba.* ########## @@ -501,6 +511,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_bindir}/kfouleggs %{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png %{tde_tdedocdir}/HTML/en/kfouleggs/ +%{tde_mandir}/man*/kfouleggs.* ########## @@ -533,6 +544,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/KGoldrunner.desktop %{tde_bindir}/kgoldrunner %{tde_tdedocdir}/HTML/en/kgoldrunner/ +%{tde_mandir}/man*/kgoldrunner.* ########## @@ -558,6 +570,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kjumpingcube.desktop %{tde_datadir}/config.kcfg/kjumpingcube.kcfg %{tde_tdedocdir}/HTML/en/kjumpingcube/ +%{tde_mandir}/man*/kjumpingcube.* ########## @@ -579,6 +592,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png %{tde_datadir}/apps/klickety/ %{tde_tdedocdir}/HTML/en/klickety/ +%{tde_mandir}/man*/klickety.* ########## @@ -609,6 +623,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/config.kcfg/klines.kcfg %{tde_datadir}/icons/hicolor/*/apps/klines.png %{tde_tdedocdir}/HTML/en/klines/ +%{tde_mandir}/man*/klines.* ########## @@ -631,6 +646,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_bindir}/kmahjongg %{tde_datadir}/config.kcfg/kmahjongg.kcfg %{tde_tdedocdir}/HTML/en/kmahjongg/ +%{tde_mandir}/man*/kmahjongg.* ########## @@ -657,6 +673,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/kmines/ %{tde_bindir}/kmines %{tde_tdedocdir}/HTML/en/kmines/ +%{tde_mandir}/man*/kmines.* ########## @@ -679,6 +696,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/knetwalk.png %{tde_tdeappdir}/knetwalk.desktop %{tde_tdedocdir}/HTML/en/knetwalk/ +%{tde_mandir}/man*/knetwalk.* ########## @@ -709,6 +727,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_libdir}/libkolf.so.1.2.0 %{tde_tdedocdir}/HTML/en/kolf/ %config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc +%{tde_mandir}/man*/kolf.* ########## @@ -749,6 +768,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/konquest.desktop %{tde_bindir}/konquest %{tde_tdedocdir}/HTML/en/konquest/ +%{tde_mandir}/man*/konquest.* ########## @@ -769,6 +789,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kpat.desktop %{tde_bindir}/kpat %{tde_tdedocdir}/HTML/en/kpat/ +%{tde_mandir}/man*/kpat.* ########## @@ -789,6 +810,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kpoker.desktop %{tde_bindir}/kpoker %{tde_tdedocdir}/HTML/en/kpoker/ +%{tde_mandir}/man*/kpoker.* ########## @@ -818,6 +840,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz %{tde_datadir}/icons/hicolor/*/apps/kreversi.png %{tde_tdedocdir}/HTML/en/kreversi/ +%{tde_mandir}/man*/kreversi.* ########## @@ -840,6 +863,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/ksame/ %{tde_tdeappdir}/ksame.desktop %{tde_tdedocdir}/HTML/en/ksame/ +%{tde_mandir}/man*/ksame.* ########## @@ -863,6 +887,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/kshisen.desktop %{tde_bindir}/kshisen %{tde_tdedocdir}/HTML/en/kshisen/ +%{tde_mandir}/man*/kshisen.* ########## @@ -890,6 +915,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_bindir}/ksirtet %{tde_datadir}/config.kcfg/ksirtet.kcfg %{tde_tdedocdir}/HTML/en/ksirtet/ +%{tde_mandir}/man*/ksirtet.* ########## @@ -911,6 +937,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/ksmiletris.desktop %{tde_bindir}/ksmiletris %{tde_tdedocdir}/HTML/en/ksmiletris/ +%{tde_mandir}/man*/ksmiletris.* ########## @@ -932,6 +959,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/ksnake.desktop %{tde_bindir}/ksnake %{tde_tdedocdir}/HTML/en/ksnake/ +%{tde_mandir}/man*/ksnake.* ########## @@ -967,6 +995,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/ksokoban.png %{tde_bindir}/ksokoban %{tde_tdedocdir}/HTML/en/ksokoban/ +%{tde_mandir}/man*/ksokoban.* ########## @@ -992,6 +1021,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_bindir}/kspaceduel %{tde_datadir}/config.kcfg/kspaceduel.kcfg %{tde_tdedocdir}/HTML/en/kspaceduel/ +%{tde_mandir}/man*/kspaceduel.* ########## @@ -1013,6 +1043,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/ktron/ %{tde_datadir}/config.kcfg/ktron.kcfg %{tde_tdedocdir}/HTML/en/ktron/ +%{tde_mandir}/man*/ktron.* ########## @@ -1047,6 +1078,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/ktuberling/ %{tde_datadir}/mimelnk/application/x-tuberling.desktop %{tde_tdedocdir}/HTML/en/ktuberling/ +%{tde_mandir}/man*/ktuberling.* ########## @@ -1077,6 +1109,8 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/twin4.png %{tde_tdeappdir}/twin4.desktop %{tde_tdedocdir}/HTML/en/twin4/ +%{tde_mandir}/man*/twin4.* +%{tde_mandir}/man*/twin4proc.* ########## @@ -1104,6 +1138,27 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/icons/hicolor/*/apps/lskat.png %{tde_tdeappdir}/lskat.desktop %{tde_tdedocdir}/HTML/en/lskat/ +%{tde_mandir}/man*/lskat.* +%{tde_mandir}/man*/lskatproc.* + +########## + +%package -n trinity-tdefifteen +Summary: Puzzle-solving game for Trinity +Group: Amusements/Games + +%description -n trinity-tdefifteen +TDEFifteen is a sliding puzzle that consists of a frame of numbered square +tiles in random order with one tile missing. + +This package is part of Trinity, and a component of the TDE games module. + +%files -n trinity-tdefifteen +%defattr(-,root,root,-) +%{tde_bindir}/tdefifteen +%{tde_tdeappdir}/tdefifteen.desktop +%{tde_datadir}/icons/hicolor/*/apps/tdefifteen.png +%{tde_mandir}/man*/tdefifteen.* ########## diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index b2a5f6a48..673274afe 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -261,9 +261,9 @@ BuildRequires: speex-devel # Build kopete motionaway plugin %if 0%{?rhel} == 5 -%define global build_kopete_motionaway 0 +%define build_kopete_motionaway 0 %else -%define global build_kopete_motionaway 1 +%define build_kopete_motionaway 1 %endif Obsoletes: trinity-kdenetwork < %{version}-%{release} diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index 04f86ad6d..d193d02ff 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -355,7 +355,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE. %{tde_datadir}/icons/hicolor/*/apps/irkick.png %{tde_datadir}/icons/locolor/*/apps/irkick.png %{tde_tdedocdir}/HTML/en/irkick/ -%{tde_tdedocdir}/HTML/en/kcmlirc/ +%{tde_tdedocdir}/HTML/en/kcontrol/kcmlirc/ ##########