From f6042194a160d58772626035fa59604da08e06e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 30 Jul 2019 19:54:39 +0200 Subject: RPM: update packages to build on Fedora 30, Mageia 7 --- redhat/Makefile.r14 | 19 +- redhat/applications/amarok/amarok-14.0.0.spec | 7 + .../applications/gtk-qt-engine/gtk-qt-engine.rc.sh | 2 +- .../applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 | 2 +- redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 | 2 +- .../kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec | 2 +- redhat/applications/konversation/konversation.spec | 6 + .../kstreamripper/kstreamripper-14.0.0.spec | 11 +- .../applications/qalculate-tde/qalculate-tde.spec | 3 + .../smartcardauth/smartcardauth-14.0.0.spec | 3 +- .../tde-guidance/tde-guidance-14.0.0.spec | 7 +- redhat/applications/tellico/tellico-14.0.0.spec | 8 + redhat/build/get_latest_tarball_filename.sh | 38 +--- redhat/build/get_latest_tarball_version.sh | 2 +- redhat/build/get_rpm_package_name.sh | 8 +- redhat/build/is_latest_package_built.sh | 4 +- redhat/dependencies/tqt3/tqt3-14.0.0.spec | 8 +- .../tqtinterface/tqtinterface-14.0.0.spec | 4 + redhat/docker/f30/Dockerfile.i686 | 27 +++ redhat/docker/f30/Dockerfile.x86_64 | 27 +++ redhat/docker/f30/packages | 223 +++++++++++++++++++ redhat/docker/f30/rpmbuild.repo | 11 + redhat/docker/f30/rpmmacros | 3 + redhat/docker/mga7/Dockerfile.i686 | 35 +++ redhat/docker/mga7/Dockerfile.x86_64 | 35 +++ redhat/docker/mga7/packages.i686 | 242 +++++++++++++++++++++ redhat/docker/mga7/packages.x86_64 | 242 +++++++++++++++++++++ redhat/docker/mga7/rpmmacros | 4 + redhat/docker/oss151/Dockerfile.x86_64 | 23 ++ redhat/docker/oss151/packages | 192 ++++++++++++++++ redhat/docker/oss151/rpmmacros | 3 + redhat/extras/fileshareset/fileshareset.spec | 2 +- .../pytdeextensions/pytdeextensions-14.0.0.spec | 12 + .../python-trinity/python-trinity-14.0.0.spec | 4 + redhat/main/tdeaddons/tdeaddons-14.0.0.spec | 8 + redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 | 5 + redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 | 5 + redhat/main/tdebase/pamd.kdm-trinity-np.fc30 | 16 ++ redhat/main/tdebase/pamd.kdm-trinity-np.mga7 | 11 + redhat/main/tdebase/pamd.kdm-trinity.fc30 | 23 ++ redhat/main/tdebase/pamd.kdm-trinity.mga7 | 15 ++ redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 | 5 + redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 | 5 + redhat/main/tdebase/tdm.fc30.pp | Bin 0 -> 932 bytes redhat/main/tdebase/tdm.service.fc30 | 12 + redhat/main/tdebindings/tdebindings-14.0.0.spec | 3 +- redhat/main/tdeedu/tdeedu-14.0.0.spec | 6 + redhat/main/tdesdk/tdesdk-14.0.0.spec | 9 + 48 files changed, 1289 insertions(+), 55 deletions(-) create mode 100644 redhat/docker/f30/Dockerfile.i686 create mode 100644 redhat/docker/f30/Dockerfile.x86_64 create mode 100644 redhat/docker/f30/packages create mode 100644 redhat/docker/f30/rpmbuild.repo create mode 100644 redhat/docker/f30/rpmmacros create mode 100644 redhat/docker/mga7/Dockerfile.i686 create mode 100644 redhat/docker/mga7/Dockerfile.x86_64 create mode 100644 redhat/docker/mga7/packages.i686 create mode 100644 redhat/docker/mga7/packages.x86_64 create mode 100644 redhat/docker/mga7/rpmmacros create mode 100644 redhat/docker/oss151/Dockerfile.x86_64 create mode 100644 redhat/docker/oss151/packages create mode 100644 redhat/docker/oss151/rpmmacros create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc30 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.mga7 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc30 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.mga7 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 create mode 100644 redhat/main/tdebase/tdm.fc30.pp create mode 100644 redhat/main/tdebase/tdm.service.fc30 diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 57eb8eb56..17ffbc308 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -168,10 +168,15 @@ endif esound: # Build on Mageia, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw)) +ifneq (,$(filter $(DIST),.mga5 .mga6 .mga7 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/esound) endif +exiv2: +ifneq (,$(filter $(DIST),.mga7 .fc30)) + $(call buildpkg,3rdparty/exiv2) +endif + file: # Build on CentOS 5 ifneq (,$(filter $(DIST),.el5)) @@ -211,8 +216,8 @@ endif endif lcms: -# Build on EL7, OSS150, OSSTW -ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) +# Build on EL7, MGA7, OSS >= 150, OSSTW +ifneq (,$(filter $(DIST),.el7 .oss150 .oss151 .osstw .mga7)) $(call buildpkg,3rdparty/lcms) endif @@ -248,7 +253,7 @@ endif mp4v2: # Build on OpenSUSE only -ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw)) +ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/mp4v2) endif @@ -281,7 +286,7 @@ endif recode: # Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150 .osstw)) +ifneq (,$(filter $(DIST),.oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/recode) endif @@ -311,7 +316,7 @@ endif wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) +ifeq (,$(filter $(DIST), .mga5 .mga6 .mga7 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw .pclos .pclos2018)) $(call buildpkg,3rdparty/wv2) endif @@ -328,7 +333,7 @@ kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi libkdcraw: tqtinterface lcms $(call buildpkg,libraries/libkdcraw) -libkexiv2: tqtinterface +libkexiv2: tqtinterface tdelibs exiv2 $(call buildpkg,libraries/libkexiv2) libkipi: tqtinterface diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec index a18b8f583..aa8f35067 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok-14.0.0.spec @@ -431,6 +431,13 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" -e "s|Config\.|RbConfig\.|g" fi +%if 0%{?fedora} >= 30 +%__sed -i "amarok/src/scripts/playlist2html/playlist2html.py" \ + "amarok/src/scripts/playlist2html/PlaylistServer.py" \ + "amarok/src/scripts/webcontrol/WebControl.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh index d22c56f35..0c82b8b5f 120000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 index fbb967811..f71a6795b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 \ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 \ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 index 122ae8e16..8e006a46b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec index 354af853e..2f6e60e4a 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec @@ -38,7 +38,7 @@ %define _docdir %{tde_docdir} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 %define debug_package %{nil} %endif diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index 27aa8edaa..1c2629084 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -176,6 +176,12 @@ and experienced users alike will appreciate its many features: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 +%__sed -i "konversation/scripts/media" \ + "konversation/scripts/weather" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index d5395491a..988dd77ac 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 %global debug_package %{nil} %endif @@ -59,6 +59,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: scons-local-2.5.1.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -100,7 +101,7 @@ you with managing/ripping your preferred streams. %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1 %__rm -f kde.py @@ -109,14 +110,14 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export QTDIR=/usr -scons configure prefix="%{_prefix}" -scons %{?_smp_mflags} +python ./scons.py configure prefix="%{_prefix}" +python ./scons.py %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -DESTDIR="%{?buildroot}" scons install +DESTDIR="%{?buildroot}" python ./scons.py install # Missing icon file will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index bd98db971..bf149cdc9 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -74,6 +74,9 @@ BuildRequires: cln-devel %if 0%{?pclinuxos} >= 2018 BuildRequires: libcln-devel %endif +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}cln-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec index 27ed4338c..8c9d3fc8c 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec @@ -33,7 +33,7 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} %define debug_package %{nil} %endif @@ -180,6 +180,7 @@ export PATH="%{tde_bindir}:${PATH}" %__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon" %__cp -Rp "usr/"* "%{buildroot}%{_prefix}" +sed -i "%{?buildroot}%{_datadir}/applications/"*".desktop" -e "/^Categories/ s|TDE|X-TDE|" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop" %endif diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index 02b6c3b33..ebf6e0021 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -421,8 +421,13 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py # Replace all '#!' calls to python with /usr/bin/python # and make them executable +%if 0%{?fedora} >= 30 +%define python /usr/bin/python2 +%else +%define python /usr/bin/python +%endif for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \ $i > $i.temp; if cmp --quiet $i $i.temp; then rm -f $i.temp; diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index 8cb0aae90..fa1d1495f 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -272,6 +272,14 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|" fi +%if 0%{?fedora} >= 30 +%__sed -i "src/fetch/scripts/dark_horse_comics.py" \ + "src/fetch/scripts/ministerio_de_cultura.py" \ + "src/fetch/scripts/fr.allocine.py" \ + "src/translators/griffith2tellico.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index d7e1ce37d..895516a2a 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.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.6}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ @@ -10,33 +10,13 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" -RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" -o -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Now look in the 'tde-packaging' directory -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry without 'trinity-*', and allow any TAR extension. -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry without 'trinity-*', and allow any TAR extension. -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry by removing numbers in package name, e.g "imlib1" => "imlib" -RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - +RET="" +for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do + for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do + RET=$(find "${dir}" -follow -type f -name ${v} | sort -V | tail -n 1) + [ -r "${RET}" ] && break + done + [ -r "${RET}" ] && echo "${RET}" && break +done exit 0 diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index 00a468d49..c06f5a4a1 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.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.6}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 2989aebef..cde3d430b 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -22,7 +22,7 @@ case "${PKGNAME}" in # Most TDE dependencies have no prefix "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies - "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -45,6 +45,7 @@ case "${PKGNAME}" in "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; "digikam") PKGRUNTIME="digikam-i18n";; "esound") PKGRUNTIME="${lib}esd0";; + "exiv2") PKGRUNTIME="${lib}exiv2_26";; "imlib1") PKGRUNTIME="${lib}Imlib1";; "knetworkmanager8") PKGRUNTIME="knetworkmanager";; "koffice") PKGRUNTIME="koffice-suite";; @@ -93,10 +94,11 @@ if [ -n "${DEVEL}" ]; then "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";; "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";; "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";; - "esound") PKGDEVEL="libesd-devel";; + "esound") PKGDEVEL="libesd0-devel";; + "exiv2") PKGDEVEL="${lib}exiv2-devel-0.26";; "imlib1") PKGDEVEL="${lib}Imlib-devel";; "koffice") PKGDEVEL="koffice-devel";; - "lcms") PKGDEVEL="liblcms-devel";; + "lcms") PKGDEVEL="${lib}lcms-devel";; "libart-lgpl") PKGDEVEL="libart_lgpl-devel";; "libcaldav") PKGDEVEL="${lib}caldav-devel";; "libcarddav") PKGDEVEL="${lib}carddav-devel";; diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 5ce0c83a9..5792905d9 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -4,9 +4,11 @@ PKGNAME="${1##*/}" TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION}) -TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) +TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" +[ -z "${TARBALL}" ] && exit 1 + # If package version contains a "~": it's a pre-release if [ "${BUILT/\~/}" != "${BUILT}" ]; then if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 2a9d0c917..b7fc869e6 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -274,7 +274,11 @@ BuildRequires: sqlite3-devel # POSTGRESQL support BuildRequires: postgresql +%if 0%{?fedora} >= 30 +BuildRequires: postgresql-server-devel +%else BuildRequires: postgresql-devel +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -1407,7 +1411,9 @@ echo yes | ./configure \ -v # proceed -%__make %{?_smp_mflags} sub-src sub-plugins sub-tools +%__make %{?_smp_mflags} sub-src || %__make sub-src +%__make %{?_smp_mflags} sub-plugins || %__make sub-plugins +%__make %{?_smp_mflags} sub-tools # build tqtconv2ui %__make -C tools/designer/tools/tqtconv2ui diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 09c1cab1d..de6ad4622 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -78,8 +78,12 @@ BuildRequires: pkgconfig # PTHREAD support %if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}npth-devel +%else BuildRequires: pth-devel %endif +%endif %if 0%{?fedora} && 0%{?fedora} <= 26 BuildRequires: pth-devel %endif diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 new file mode 100644 index 000000000..66895fd5c --- /dev/null +++ b/redhat/docker/f30/Dockerfile.i686 @@ -0,0 +1,27 @@ +FROM fedora32:30 + +ARG TDE_VERSION=14.0.6 +ARG ARCH=i686 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN setarch i686 dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm + +# Install Trinity build dependencies +RUN setarch i686 dnf -y --enableplugin=ovl update +ADD packages /packages +#RUN cat /packages | xargs -n 10 -P 1 setarch i686 dnf -y --enableplugin=ovl install +RUN setarch i686 dnf -y --enableplugin=ovl install $(>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64 new file mode 100644 index 000000000..546697d76 --- /dev/null +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -0,0 +1,27 @@ +FROM fedora:30 + +ARG TDE_VERSION=14.0.6 +ARG ARCH=x86_64 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm + +# Install Trinity build dependencies +RUN dnf -y --enableplugin=ovl update +ADD packages /packages +#RUN cat /packages | xargs -n 10 -P 1 dnf -y --enableplugin=ovl install +RUN dnf -y --enableplugin=ovl install $(>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages new file mode 100644 index 000000000..fa29bfd39 --- /dev/null +++ b/redhat/docker/f30/packages @@ -0,0 +1,223 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +boost-devel +bzip2-devel +ccache +ccrtp-devel +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +commoncpp2-devel +cpp +cppunit-devel +createrepo +cryptsetup-devel +cups-devel +db4-devel +dbus-glib-devel +djvulibre +djvulibre-devel +doxygen +dssi-devel +esound-devel +exempi-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-devel +hspell-devel +htdig +html2ps +icu +ImageMagick-devel +imake +imlib-devel +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +postgresql-server-devel +pulseaudio-libs-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel +yum-plugin-ovl diff --git a/redhat/docker/f30/rpmbuild.repo b/redhat/docker/f30/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f30/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f30/rpmmacros b/redhat/docker/f30/rpmmacros new file mode 100644 index 000000000..55a9b7b5a --- /dev/null +++ b/redhat/docker/f30/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc30 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 new file mode 100644 index 000000000..af381b17e --- /dev/null +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -0,0 +1,35 @@ +FROM mageia32:7 + +ARG TDE_VERSION=14.0.6 +ARG ARCH=i686 + +# Reset URPMI repositories to default +RUN urpmi.removemedia -a +RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' + +# Enable more URPMI repositories +RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Update distribution +RUN urpmi.update -a +RUN urpmi --auto-select --auto + +# Install Trinity build dependencies +ADD packages.${ARCH} /packages +RUN urpmi --auto $(>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 new file mode 100644 index 000000000..2a567685b --- /dev/null +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -0,0 +1,35 @@ +FROM mageia:7 + +ARG TDE_VERSION=14.0.6 +ARG ARCH=x86_64 + +# Reset URPMI repositories to default +RUN urpmi.removemedia -a +RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' + +# Enable more URPMI repositories +RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Update distribution +RUN urpmi.update -a +RUN urpmi --auto-select --auto + +# Install Trinity build dependencies +ADD packages.${ARCH} /packages +RUN urpmi --auto $(>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686 new file mode 100644 index 000000000..471051206 --- /dev/null +++ b/redhat/docker/mga7/packages.i686 @@ -0,0 +1,242 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-devel +freetype2-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +glib2-devel +gmime-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +hunspell-en +ImageMagick-devel +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +karma-sharp +kde-dev-scripts +libapr-devel +libapr-util-devel +libavformat58 +libbinutils-devel +libcln-devel +libclucene-devel +libcommoncpp-devel +libcryptsetup-devel +libcurl-devel +libdvdread-devel +libecpg9.6_6 +libfbclient-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libfontenc-devel +libgmime2.6-devel +libgstreamer1.0-devel +libgstreamer-plugins-base1.0-devel +libinotifytools-devel +libjasper-devel +libjpeg-devel +libmp3lame-devel +liblua-devel +libmad-devel +libpaper-devel +libpkcs11-helper-devel +libpoppler-devel +libpulseaudio-devel +libsane1-devel +libt1lib-devel +libtiff-devel +libtwolame-devel +libudev-devel +libusb1.0-devel +libutempter +libutempter-devel +libv4l-devel +libxaw-devel +libxdg-basedir-devel +libxi-devel +libxine1.2-devel +libxscrnsaver-devel +libxtst-devel +libxxf86dga-devel +libyaz-devel +libart_lgpl-devel +libattr-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libidn-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon +ocaml +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +optipng +pam-devel +pciutils-devel +perl-devel +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +postgresql9.6 +postgresql9.6-devel +libnpth-devel +python-devel +python-sip +qt4-devel +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sudo +subversion-devel +swig +sword-devel +taglib-devel +torsocks +transfig +udisks2-devel +udisks-devel +unixODBC-devel +usbutils +valgrind +wv2-devel +x11-font-util +xbase-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz +zlib-devel diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 new file mode 100644 index 000000000..7954d51b9 --- /dev/null +++ b/redhat/docker/mga7/packages.x86_64 @@ -0,0 +1,242 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-devel +freetype2-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +glib2-devel +gmime-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +hunspell-en +ImageMagick-devel +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +karma-sharp +kde-dev-scripts +lib64apr-devel +lib64apr-util-devel +lib64avformat58 +lib64binutils-devel +lib64cln-devel +lib64clucene-devel +lib64commoncpp-devel +lib64cryptsetup-devel +lib64curl-devel +lib64dvdread-devel +lib64ecpg9.6_6 +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac-devel +lib64flac++-devel +lib64fontenc-devel +lib64gmime2.6-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64mp3lame-devel +lib64lua-devel +lib64mad-devel +lib64paper-devel +lib64pkcs11-helper-devel +lib64poppler-devel +lib64pulseaudio-devel +lib64sane1-devel +lib64t1lib-devel +lib64tiff-devel +lib64twolame-devel +lib64udev-devel +lib64usb1.0-devel +lib64utempter +lib64utempter-devel +lib64v4l-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine1.2-devel +lib64xscrnsaver-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64yaz-devel +libart_lgpl-devel +libattr-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libidn-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon +ocaml +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +optipng +pam-devel +pciutils-devel +perl-devel +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +postgresql9.6 +postgresql9.6-devel +lib64npth-devel +python-devel +python-sip +qt4-devel +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sudo +subversion-devel +swig +sword-devel +taglib-devel +torsocks +transfig +udisks2-devel +udisks-devel +unixODBC-devel +usbutils +valgrind +wv2-devel +x11-font-util +xbase-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz +zlib-devel diff --git a/redhat/docker/mga7/rpmmacros b/redhat/docker/mga7/rpmmacros new file mode 100644 index 000000000..8d3b31456 --- /dev/null +++ b/redhat/docker/mga7/rpmmacros @@ -0,0 +1,4 @@ +%dist .mga7 +%_smp_mflags -j8 +%jobs 8 +%_program_prefix "" diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 new file mode 100644 index 000000000..8af159aac --- /dev/null +++ b/redhat/docker/oss151/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse/leap:15.1 + +ARG TDE_VERSION=14.0.6 +ARG ARCH=x86_64 + +# Add PACKMAN repository +RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.1/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /packages +RUN zypper install -l -y $(>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} +RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages new file mode 100644 index 000000000..0500c5913 --- /dev/null +++ b/redhat/docker/oss151/packages @@ -0,0 +1,192 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +cln-devel +clucene-core-devel +cmake +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgssglue-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libotr-devel +libpaper-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libyaz-devel +libzrtpcpp-devel +lilo +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +qt-devel +rpcgen +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss151/rpmmacros b/redhat/docker/oss151/rpmmacros new file mode 100644 index 000000000..d7dfb7aeb --- /dev/null +++ b/redhat/docker/oss151/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss151 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 0db433bc2..95120702b 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -19,7 +19,7 @@ #copyright : (C) 2003 SuSE AG #email : Uwe.Gansert@suse.de -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 %global debug_package %{nil} %endif diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index 88888da02..b8835c6d2 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -185,6 +185,18 @@ fi %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" %endif +%if 0%{?fedora} >= 30 +%__sed -i "app_templates/kcontrol_module/setup.py" \ + "app_templates/kcontrol_module/src/kcontrol_module.py" \ + "app_templates/kdeapp/setup.py" \ + "app_templates/kdeapp/src/kdeapp.py" \ + "app_templates/kdeutility/setup.py" \ + "app_templates/kdeutility/src/kdeutility.py" \ + "app_templates/tdeioslave/setup.py" \ + "app_templates/tdeioslave/src/tdeioslave.py" \ + -e "s|/usr/bin/python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index f969038f9..51edd425b 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -139,6 +139,10 @@ tips and working code you can use to learn from. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 +%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec index 5d546fb8e..90ddfe3e6 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec @@ -664,6 +664,14 @@ of user interfaces, playlists and visualisation plugins. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 +# Fix shebangs +sed -i "knewsticker-scripts/sportscores.py" \ + "konq-plugins/imagerotation/orient.py" \ + "konq-plugins/imagerotation/exif.py" \ + -e "s|env python|env python3|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc30 b/redhat/main/tdebase/pamd.kdm-trinity.fc30 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc30 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga7 b/redhat/main/tdebase/pamd.kdm-trinity.mga7 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga7 @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_succeed_if.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth substack system-auth +-auth optional pam_kwallet.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/tdm.fc30.pp b/redhat/main/tdebase/tdm.fc30.pp new file mode 100644 index 000000000..d0c0d4be8 Binary files /dev/null and b/redhat/main/tdebase/tdm.fc30.pp differ diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/main/tdebase/tdm.service.fc30 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc30 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index a70c39b3d..4b9de5a75 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -711,6 +711,7 @@ This package is part of the official TDE bindings module. %package -n trinity-kjscmd Summary: A script interpreter using the TDE JavaScript library Group: System/Libraries +Provides: %{tde_bindir}/kjscmd %description -n trinity-kjscmd This package contains the kjscmd program, which is a standalone @@ -1022,7 +1023,7 @@ exit 3 -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" # Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd' -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 %__sed -i "kjsembed/tdescript/swaptabs.js" \ -i "kjsembed/stdlib/cmdline.js" \ -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|" diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec index ca5d13cd8..af7343097 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec @@ -1062,6 +1062,12 @@ This package contains the development files for tdeedu. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 +# Fix shebangs +sed -i "kig/pykig/pykig.py" \ + -e "s|env python|env python3|" +%endif + # RHEL5 strange FTBFS on V4L stuff %if 0%{?rhel} == 5 %__sed -i "admin/acinclude.m4.in" -e "s|-ansi||" diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec index 788bd6107..dac97e526 100644 --- a/redhat/main/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec @@ -1007,6 +1007,15 @@ This package contains the development files for tdesdk. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 +# Fix shebangs +sed -i "scripts/kdelnk2desktop.py" \ + "scripts/zonetab2pot.py" \ + "tdecachegrind/converters/hotshot2calltree" \ + "umbrello/umbrello/headings/heading.py" \ + -e "s|env python|env python3|" +%endif + %build unset QTDIR QTINC QTLIB -- cgit v1.2.1