diff --git a/redhat/Makefile b/redhat/Makefile index 733b96e57..ae0a100e5 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -56,9 +56,6 @@ libcaldav: tqtinterface libcarddav: tqtinterface $(call buildpkg,dependencies/libcarddav) -libr: - $(call buildpkg,dependencies/libr) - python-tqt: sip4-tqt tdelibs tqscintilla $(call buildpkg,dependencies/python-tqt) @@ -105,11 +102,10 @@ tdeedu: tdebase tdegames: tdebase tdemultimedia $(call buildpkg,main/tdegames) -tdegraphics: tdebase poppler lcms +tdegraphics: tdebase lcms $(call buildpkg,main/tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl file - [ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || : +tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode @@ -118,7 +114,7 @@ tdemultimedia: tdebase akode tdenetwork: tdebase rdesktop $(call buildpkg,main/tdenetwork) -tdepim: tdebase libcaldav libcarddav dirmngr +tdepim: tdebase libcaldav libcarddav $(call buildpkg,main/tdepim) tdesdk: tdebase tdebindings @@ -137,90 +133,36 @@ tdewebdev: tdebase tdesdk $(call buildpkg,main/tdewebdev) ### 3rd party libraries and tools - -cscope: -# Build on PCLOS only -ifneq ($(wildcard /etc/pclinuxos-release),) - $(call buildpkg,3rdparty/cscope) -endif - -dirmngr: -# Build on CentOS >= 7 -ifneq ($(wildcard /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/dirmngr) -endif - esound: -# Build on Mageia, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.el8 .mga5 .mga6 .mga7 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .oss151 .osstw)) +ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .osstw )) $(call buildpkg,3rdparty/esound) endif -gmime: -# Build on CentOS 6 -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/gmime) -endif - htdig: -# build on Mageia, and CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7* /boot/loader/entries/*el8*),) +ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 )) $(call buildpkg,extras/htdig) endif imlib1: -# Do NOT build on Fedora, nor CentOS, nor PCLOS -ifeq ($(wildcard /etc/fedora-release),) -ifeq (,$(filter $(DIST),.el5 .el6 .el7)) +ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) $(call buildpkg,3rdparty/imlib1) endif -endif lcms: -# Build on EL7, MGA7, OSS >= 150, OSSTW -ifneq (,$(filter $(DIST),.el7 .el8 .oss150 .oss151 .osstw .mga7)) +ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .osstw )) $(call buildpkg,3rdparty/lcms) endif libbeagle: $(call buildpkg,3rdparty/libbeagle) -lilypond: mftrace -# Build on CentOS 6 only -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/lilypond) -endif - -mftrace: -# Build on CentOS 6 only -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/mftrace) -endif - mp4v2: -# Build on OpenSUSE only -ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw)) +ifneq (,$(filter $(DIST), .oss151 .osstw )) $(call buildpkg,3rdparty/mp4v2) endif -pcsc-perl: -# Build on CentOS 5 -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/pcsc-perl) -endif - -poppler: -# Build on CentOS 5 only (vendor-provided Poppler is too old) -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/poppler) -endif - -python-qt3: tdelibs sip - $(call buildpkg,3rdparty/python-qt3) - rdesktop: -# Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150)) +ifneq (,$(filter $(DIST), .oss150 )) $(call buildpkg,3rdparty/rdesktop) endif @@ -236,34 +178,11 @@ ifneq (,$(filter $(DIST),.oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/recode) endif -sip: -# Build on CentOS 5 only (vendor-provided SIP is too old) -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/sip) -endif - -sword: -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/sword) -endif - -torsocks: -ifneq (,$(filter $(DIST), .oss)) - $(call buildpkg,3rdparty/torsocks) -endif - wv2: -# Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .mga7 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw .pclos)) +ifneq (,$(filter $(DIST), .el6 .el7 .el8 .fc30 .fc31 )) $(call buildpkg,3rdparty/wv2) endif -yaz: -# Build on CentOS 7, CentOS 8 -ifneq (,$(filter $(DIST), .el7 .el8)) - $(call buildpkg,3rdparty/yaz) -endif - ### Trinity Libraries kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi @@ -309,7 +228,7 @@ amarok: tdebase mp4v2 basket: tdebase tdepim $(call buildpkg,applications/basket) -bibletime: tdebase sword +bibletime: tdebase $(call buildpkg,applications/bibletime) compizconfig-backend-kconfig: tdebase @@ -334,16 +253,12 @@ fusion-icon: tdebase $(call buildpkg,applications/fusion-icon) gtk3-tqt-engine: tdebase -# Do NOT build on CentOS 5, CentOS 6 -ifeq (,$(filter $(DIST),.el5 .el6)) +ifeq (,$(filter $(DIST),.el6)) $(call buildpkg,applications/gtk3-tqt-engine) endif gtk-qt-engine: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/gtk-qt-engine) -endif gwenview: tdebase $(call buildpkg,applications/gwenview) @@ -372,7 +287,7 @@ kbarcode: tdebase kbfx: tdebase $(call buildpkg,applications/kbfx) -kbibtex: tdebase yaz +kbibtex: tdebase $(call buildpkg,applications/kbibtex) kbiff: tdebase @@ -388,19 +303,13 @@ kcmautostart: tdebase $(call buildpkg,applications/kcmautostart) kcmldap: tdebase libtdeldap -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldap) -endif kcmldapcontroller: tdebase kcmldap -ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/kcmldapcontroller) -endif kcmldapmanager: tdebase kcmldap -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapmanager) -endif kcpuload: tdebase $(call buildpkg,applications/kcpuload) @@ -424,9 +333,7 @@ keep: tdebase rdiff-backup $(call buildpkg,applications/keep) kerberostray: tdebase -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kerberostray) -endif kerry: tdebase libbeagle $(call buildpkg,applications/kerry) @@ -435,13 +342,7 @@ kftpgrabber: tdebase $(call buildpkg,applications/kftpgrabber) kgtk-qt3: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) -# Do NOT build on CentOS >=7 (GTK2 is too new) -# Do NOT build on Fedora >= 20 (GTK2 is too new) -# Do NOT build on Mageia >= 4 (GTK2 is too new) -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),) $(call buildpkg,applications/kgtk-qt3) -endif kile: tdebase $(call buildpkg,applications/kile) @@ -521,7 +422,7 @@ krename: tdebase krusader: tdebase tdebindings $(call buildpkg,applications/krusader) -kscope: tdebase cscope +kscope: tdebase $(call buildpkg,applications/kscope) ksensors: tdebase @@ -574,12 +475,12 @@ ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw)) $(call buildpkg,applications/qt4-tqt-theme-engine) endif -rosegarden: tdebase lilypond -ifeq (,$(filter $(DIST),.el5 .el7 .el8)) +rosegarden: tdebase +ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8)) $(call buildpkg,applications/rosegarden) endif -smartcardauth: tdebase pcsc-perl +smartcardauth: tdebase ifeq (,$(filter $(DIST),.el8)) $(call buildpkg,applications/smartcardauth) endif @@ -602,23 +503,19 @@ tdeio-ftps: tdebase tdeio-locate: tdebase $(call buildpkg,applications/tdeio-locate) -tdeio-sword: tdebase sword +tdeio-sword: tdebase $(call buildpkg,applications/tdeio-sword) tdeio-umountwrapper: tdebase $(call buildpkg,applications/tdeio-umountwrapper) tdenetworkmanager: tdebase -# Do NOT build on CentOS 5, CentOS 6 -ifeq (,$(filter $(DIST),.el5 .el6)) +ifeq (,$(filter $(DIST),.el6)) $(call buildpkg,applications/tdenetworkmanager) endif tdepowersave: tdebase -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tdepowersave) -endif tderadio: tdebase $(call buildpkg,applications/tderadio) @@ -644,7 +541,7 @@ tdmtheme: tdebase tellico: tdebase tdemultimedia $(call buildpkg,applications/tellico) -tork: tdebase torsocks +tork: tdebase $(call buildpkg,applications/tork) twin-style-crystal: tdebase @@ -716,8 +613,8 @@ kpacman: mathemagics: $(call buildpkg,extras/mathemagics) -pan: gmime intltool -ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) +pan: gmime +ifeq (,$(filter $(DIST),.oss150 .osstw)) $(call buildpkg,3rdparty/pan) endif diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 1cb4a1be3..24e6164ac 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -104,11 +104,7 @@ BuildRequires: pkcs11-helper-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 %if 0%{?mgaversion} || 0%{?mdkversion} -#%if 0%{?pclinuxos} -#BuildRequires: db4-devel -#%else BuildRequires: db5-devel -#%endif %endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index c1daea7b4..31e3148da 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -267,12 +267,17 @@ BuildRequires: sqlite3-devel %endif # POSTGRESQL support +%if 0%{?suse_version} >= 1550 +BuildRequires: postgresql10 +BuildRequires: postgresql10-devel +%else BuildRequires: postgresql %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 BuildRequires: postgresql-server-devel %else BuildRequires: postgresql-devel %endif +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index ccca2f0d3..ba9982502 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -3,7 +3,11 @@ FROM centos32:6 ARG TDE_VERSION=14.0.7 ARG ARCH=i686 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" + +# Update distribution packages +RUN setarch ${ARCH} yum -y update # Add EPEL repository RUN yum -y install epel-release @@ -12,21 +16,23 @@ RUN yum -y install epel-release RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm # Install Trinity build dependencies -ADD packages.trinity /packages -RUN setarch ${ARCH} yum -y update +ADD packages /packages RUN setarch ${ARCH} yum -y install $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" - # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d ADD rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Distro-specific patches +RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include / s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 51953f916..17c83998e 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -3,7 +3,11 @@ FROM centos:6 ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" + +# Update distribution packages +RUN yum -y update # Add EPEL repository RUN yum -y install epel-release @@ -12,21 +16,23 @@ RUN yum -y install epel-release RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm # Install Trinity build dependencies -ADD packages.trinity /packages -RUN yum -y update +ADD packages /packages RUN yum -y install $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" - # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d ADD rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Distro-specific patches +RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include / s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros @@ -36,7 +42,7 @@ ADD rpmmacros /home/trinity/.rpmmacros RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm -RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm diff --git a/redhat/docker/el6/centos-6.repo b/redhat/docker/el6/centos-6.repo deleted file mode 100644 index a00a85ad5..000000000 --- a/redhat/docker/el6/centos-6.repo +++ /dev/null @@ -1,30 +0,0 @@ -[centos-6-base] -name=CentOS-6 - Base -baseurl=http://repo/repo/centos/6/os/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#released updates -[centos-6-updates] -name=CentOS-6 - Updates -baseurl=http://repo/repo/centos/6/updates/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that may be useful -[centos-6-extras] -name=CentOS-6 - Extras -baseurl=http://repo/repo/centos/6/extras/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that extend functionality of existing packages -[centos-6-centosplus] -name=CentOS-6 - Plus -baseurl=http://repo/repo/centos/6/centosplus/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 diff --git a/redhat/docker/el6/epel-6.repo b/redhat/docker/el6/epel-6.repo deleted file mode 100644 index 24134a301..000000000 --- a/redhat/docker/el6/epel-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[epel] -name=epel -baseurl=http://repo/repo/epel/6/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages similarity index 99% rename from redhat/docker/el6/packages.trinity rename to redhat/docker/el6/packages index 242a46157..1ee5febb0 100644 --- a/redhat/docker/el6/packages.trinity +++ b/redhat/docker/el6/packages @@ -51,7 +51,6 @@ gcc-gfortran gcc-java gettext-devel glib-devel -gmime-devel gmp-devel gnokii-devel gperf @@ -182,6 +181,7 @@ perl(Test::MinimumVersion) perl(Test::More) perl(Test::Pod) perl(XML::Parser) +pigz pilot-link-devel pkgconfig(pygtk-2.0) pkcs11-helper-devel @@ -202,6 +202,7 @@ speex-devel sqlite-devel subversion-devel sudo +swig sword-devel t1lib-devel t1utils diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base deleted file mode 100644 index 21345a31b..000000000 --- a/redhat/docker/el6/packages.base +++ /dev/null @@ -1,7 +0,0 @@ -bash -perl -setarch -tar -vim-enhanced -yum -yum-plugin-ovl diff --git a/redhat/docker/el6/repoforge-6.repo b/redhat/docker/el6/repoforge-6.repo deleted file mode 100644 index 8747bf2df..000000000 --- a/redhat/docker/el6/repoforge-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[dag] -name=dag -baseurl=http://repo/repo/repoforge/redhat/el6/en/$basearch/dag/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 92e926cd7..c350bd995 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -3,6 +3,12 @@ FROM centos:7 ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" + +# Update distribution packages +RUN yum -y update + # Add EPEL repository RUN yum -y install epel-release @@ -11,19 +17,30 @@ RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release- # Install Trinity build dependencies ADD packages /packages -RUN yum update -y -RUN yum install -y $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index f5bd79e8d..4b6409613 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -62,6 +62,7 @@ gtk2-devel gtk+-devel gtk-doc guile-devel +hiredis-devel hspell-devel html2ps icu @@ -97,6 +98,7 @@ libical-devel libidn-devel libksba-devel libmad-devel +libmemcached-devel libmng-devel libmp4v2-devel libmpcdec-devel @@ -139,6 +141,7 @@ libXxf86vm-devel libusb-devel lirc-devel lm_sensors-devel +logrotate meanwhile-devel mysql-devel neon-devel @@ -163,6 +166,7 @@ perl-devel perl(ExtUtils::MakeMaker) perl(PAR::Packer) perl(XML::Parser) +pigz pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) @@ -192,6 +196,7 @@ t1lib-devel t1utils taglib-devel tar +tcl texinfo torsocks transfig diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index a8667f1eb..d83c0c1c9 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -3,11 +3,15 @@ FROM centos:8 ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 -RUN echo "proxy=http://proxy:3128" >>/etc/dnf/dnf.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" # Install OVL plugin for DNF RUN curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py +# Update distribution packages +RUN dnf -y update + # Add EPEL repository RUN dnf -y install epel-release @@ -21,27 +25,26 @@ RUN dnf config-manager --enable PowerTools # Enable custom repository ADD centos-devel.repo /etc/yum.repos.d/centos-devel.repo -# Update distribution packages -RUN dnf -y update - # Install Trinity build dependencies ADD packages /packages -RUN dnf -y install $(>/etc/sudoers +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" -# Build development packages USER trinity ADD rpmmacros /home/trinity/.rpmmacros -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1.8*.rpm +# Build supplementary development tools RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libxml%2b%2b-2.40.1-8.fc30.src.rpm RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm @@ -56,7 +59,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-*.rpm +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-1*.rpm --nodeps #RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/liblo-0.29-2.fc30.src.rpm #RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm @@ -73,3 +76,8 @@ RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-*.rpm RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-10.fc30.src.rpm RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64//hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64//libyaz-5.14.11-14.el8.remi.x86_64.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 45ace1eb3..739d439c4 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -88,6 +88,7 @@ libical-devel libidn-devel libksba-devel libmad-devel +libmemcached-devel libmng-devel libmp4v2-devel libmpcdec-devel @@ -154,6 +155,7 @@ perl(inc::Module::Install) perl(IPC::Run3) perl(Module::Signature) perl(XML::Parser) +pigz pkcs11-helper-devel pkgconfig(pygtk-2.0) poppler-devel @@ -168,6 +170,7 @@ python3-devel readline-devel recode redhat-rpm-config +redis rpcgen rpm-build ruby @@ -181,6 +184,7 @@ sudo swig systemd-devel taglib-devel +tcl texinfo torsocks transfig diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 index 0f8cac39d..9be8fdbfc 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -20,6 +20,9 @@ RUN setarch i686 dnf -y --enableplugin=ovl install $(>/etc/sudoers diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64 index b259f4810..31b7fb112 100644 --- a/redhat/docker/f30/Dockerfile.x86_64 +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -20,6 +20,9 @@ RUN dnf -y --enableplugin=ovl install $(>/etc/sudoers diff --git a/redhat/docker/f31/Dockerfile.i686 b/redhat/docker/f31/Dockerfile.i686 deleted file mode 100644 index 81d852e50..000000000 --- a/redhat/docker/f31/Dockerfile.i686 +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora32:31 - -ARG TDE_VERSION=14.0.7 -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 setarch i686 dnf -y --enableplugin=ovl install $(>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index e330e4d9e..62a39e78d 100644 --- a/redhat/docker/f31/Dockerfile.x86_64 +++ b/redhat/docker/f31/Dockerfile.x86_64 @@ -20,6 +20,9 @@ RUN dnf -y --enableplugin=ovl install $(>/etc/sudoers diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 798cb8c3d..02446d0ac 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -24,6 +24,9 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL # Fix poppler include causing FTBFS RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Add non-root user to build packages RUN rm -rf /home/trinity RUN useradd -m -s /bin/bash -u 1000 trinity @@ -31,7 +34,7 @@ RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index b1e552139..b656182ec 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -24,6 +24,9 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL # Fix poppler include causing FTBFS RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Add non-root user to build packages RUN rm -rf /home/trinity RUN useradd -m -s /bin/bash -u 1000 trinity @@ -31,7 +34,7 @@ RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index bbf5987ed..61e69a9d6 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -99,7 +99,7 @@ libtiff-devel libtwolame-devel libudev-devel libusb1.0-devel -libutempter +libutempter0 libutempter-devel libv4l-devel libxaw-devel diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index 0af3e9a35..0e8e91ad2 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -99,7 +99,7 @@ lib64tiff-devel lib64twolame-devel lib64udev-devel lib64usb1.0-devel -lib64utempter +lib64utempter0 lib64utempter-devel lib64v4l-devel lib64xaw-devel diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 93da2907b..67d349d52 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -21,6 +21,9 @@ RUN urpmi --auto $(>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 index b8d29a318..6f0599b57 100644 --- a/redhat/docker/mga7/Dockerfile.x86_64 +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -21,6 +21,9 @@ RUN urpmi --auto $(>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686 index 078349609..a84e869ea 100644 --- a/redhat/docker/mga7/packages.i686 +++ b/redhat/docker/mga7/packages.i686 @@ -65,114 +65,116 @@ karma-sharp kde-dev-scripts libapr-devel libapr-util-devel +libart_lgpl-devel +libattr-devel libavformat58 libbinutils-devel +libblkid-devel +libcdda-devel libcln-devel libclucene-devel +libclucene-devel +libcommoncpp-devel libcommoncpp-devel +libconfig-devel libcryptsetup-devel libcurl-devel +libcurl-devel +libdvdread-devel libdvdread-devel libecpg9.6_6 +libexiv2-devel 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 +libflac++-devel +libflac-devel +libflac-devel +libfontenc-devel libgadu-devel +libgmime2.6-devel libgpod-devel libgsf-devel +libgstreamer1.0-devel +libgstreamer-plugins-base1.0-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel +libinotifytools-devel libiodbc-devel libiw-devel libjack-devel libjasper-devel +libjasper-devel +libjpeg-devel libkarma-devel liblo-devel liblrdf-devel +liblua-devel +libmad-devel libmad-devel libmng-devel +libmp3lame-devel libmp4v2-devel libmpcdec-devel libmtp-devel libmusicbrainz-devel libnjb-devel +libnpth-devel libofx-devel libotr-devel libpaper-devel +libpaper-devel +libpkcs11-helper-devel +libpoppler-devel +libpulseaudio-devel libpx-devel libqalculate-devel libraw1394-devel librsvg +libsane1-devel libsmbclient-devel libsm-devel libsndfile-devel libt1lib-devel +libt1lib-devel libtheora-devel +libtiff-devel +libtwolame-devel +libudev-devel libungif-devel +libusb1.0-devel +libutempter0 +libutempter-devel +libv4l-devel libvisual-devel libvorbis-devel libwmf-devel libwpd-devel libx11-devel +libxaw-devel libxcursor-devel +libxdg-basedir-devel libxext-devel libxft-devel libxi-devel +libxi-devel +libxine1.2-devel libxinerama-devel libxkbfile-devel libxmu-devel libxrandr-devel libxrender-devel +libxscrnsaver-devel libxslt-devel +libxtst-devel libxv-devel libxxf86dga-devel +libxxf86dga-devel +libyaz-devel libyaz-devel lilo lirc-devel @@ -199,8 +201,8 @@ pciutils-devel perl-devel perl(IPC::Run3) perl(PAR::Packer) -perl(XML::Parser) perl-pcsc-perl +perl(XML::Parser) pilot-link-devel pinentry-gtk2 pkgconfig(audiofile) @@ -209,7 +211,6 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.6 postgresql9.6-devel -libnpth-devel python-devel python-sip qt4-devel @@ -223,8 +224,8 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel -sudo subversion-devel +sudo swig sword-devel taglib-devel diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 index 0789fcdd4..539f10c4d 100644 --- a/redhat/docker/mga7/packages.x86_64 +++ b/redhat/docker/mga7/packages.x86_64 @@ -77,8 +77,8 @@ lib64ecpg9.6_6 lib64exiv2-devel lib64fbclient-devel lib64ffmpeg-devel -lib64flac-devel lib64flac++-devel +lib64flac-devel lib64fontenc-devel lib64gmime2.6-devel lib64gstreamer1.0-devel @@ -86,9 +86,10 @@ lib64gstreamer-plugins-base1.0-devel lib64inotifytools-devel lib64jasper-devel lib64jpeg-devel -lib64mp3lame-devel lib64lua-devel lib64mad-devel +lib64mp3lame-devel +lib64npth-devel lib64paper-devel lib64pkcs11-helper-devel lib64poppler-devel @@ -120,15 +121,15 @@ libconfig-devel libcurl-devel libdvdread-devel libffmpeg-devel -libflac-devel libflac++-devel -libidn-devel +libflac-devel libgadu-devel libgpod-devel libgsf-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel libiodbc-devel libiw-devel @@ -200,8 +201,8 @@ pciutils-devel perl-devel perl(IPC::Run3) perl(PAR::Packer) -perl(XML::Parser) perl-pcsc-perl +perl(XML::Parser) pilot-link-devel pinentry-gtk2 pkgconfig(audiofile) @@ -210,7 +211,6 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.6 postgresql9.6-devel -lib64npth-devel python-devel python-sip qt4-devel @@ -224,8 +224,8 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel -sudo subversion-devel +sudo swig sword-devel taglib-devel diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index d9701cae7..a449dca81 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -16,15 +16,12 @@ RUN apt-get -y install $(>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros - # Fix SUDO configuration RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Fix missing '.la' files ADD genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 @@ -32,7 +29,20 @@ RUN genla.sh libjpeg RUN genla.sh liblcms RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la +# Add non-root user to build packages +RUN rm -rf /home/trinity +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + # Build supplementary development tools -RUN rpm -i --define "_topdir /tmp" http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/torsocks-2*.rpm +RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm +RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index fb3d39521..8b485671e 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -174,7 +174,6 @@ sudo sword-devel taglib-devel texinfo -torsocks transfig udisks2-devel unixODBC-devel diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 18ee174b5..688fc7380 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -252,7 +252,7 @@ Requires: fedora-logos # Fedora 31 Theme %if 0%{?fedora} == 31 -Requires: f28-backgrounds-base +Requires: f31-backgrounds-base %define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png