RPM packaging: updates for Fedora 28 / OpenSUSE 15.0

12 files changed, 508 insertions, 12 deletions

diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
new file mode 100644
index 000000000..ccb8d9fce
--- /dev/null
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -0,0 +1,24 @@
+FROM fedora32:28
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=i686
+
+RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
+
+# Add RPMFUSION repository
+RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
+
+# Install Trinity build dependencies
+RUN setarch i686 dnf update -y
+ADD packages /packages
+#RUN setarch i686 dnf install -y texlive-base
+RUN setarch i686 dnf install -y $(</packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# 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
+ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
new file mode 100644
index 000000000..44f7d21eb
--- /dev/null
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM fedora:28
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
+
+# Add RPMFUSION repository
+RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
+
+# Install Trinity build dependencies
+RUN dnf update -y
+ADD packages /packages
+RUN dnf install -y $(</packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# 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
+ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages
new file mode 100644
index 000000000..38e58b3cb
--- /dev/null
+++ b/redhat/docker/f28/packages
@@ -0,0 +1,218 @@
+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
+exiv2-devel
+fdupes
+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
+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
+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
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+net-snmp-devel
+net-tools
+NetworkManager-glib-devel
+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
+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
diff --git a/redhat/docker/f28/rpmbuild.repo b/redhat/docker/f28/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f28/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/f28/rpmmacros b/redhat/docker/f28/rpmmacros
new file mode 100644
index 000000000..9126fb2b2
--- /dev/null
+++ b/redhat/docker/f28/rpmmacros
@@ -0,0 +1,3 @@
+%dist .fc28
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
new file mode 100644
index 000000000..e7d5cd188
--- /dev/null
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM opensuse:15.0
+
+ARG TDE_VERSION=14.0.4
+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.0/ packman
+RUN zypper refresh
+
+# Install Trinity build dependencies
+ADD packages /packages
+RUN zypper install -l -y $(</packages)
+
+# 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
+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/oss150/packages b/redhat/docker/oss150/packages
new file mode 100644
index 000000000..aa2be744d
--- /dev/null
+++ b/redhat/docker/oss150/packages
@@ -0,0 +1,182 @@
+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
+glu-devel
+gmime-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
+libacl-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
+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
+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
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+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
+pkgconfig(ao)
+postgresql
+postgresql-devel
+python-devel
+python-sip-devel
+qt-devel
+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
+wireless-tools
+wv2-devel
+xcb-proto-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss150/rpmmacros b/redhat/docker/oss150/rpmmacros
new file mode 100644
index 000000000..9869e1ec2
--- /dev/null
+++ b/redhat/docker/oss150/rpmmacros
@@ -0,0 +1,3 @@
+%dist .oss150
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages
index fe79c5038..b02e68e9e 100644
--- a/redhat/docker/oss423/packages
+++ b/redhat/docker/oss423/packages
@@ -87,7 +87,6 @@ libiw-devel
 libjack-devel
 libjasper-devel
 liblcms-devel
-liblcms2-devel
 liblo-devel
 liblrdf-devel
 libmad-devel
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 2cd3171c7..e62321a73 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -6,11 +6,12 @@ ARG ARCH=i686
 # Add PACKMAN repository
 RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
 RUN setarch ${ARCH} zypper refresh
+RUN setarch ${ARCH} zypper --non-interactive dup
+RUN setarch ${ARCH} zypper --non-interactive update
 
 # Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN setarch ${ARCH} zypper remove -y openssl
-RUN setarch ${ARCH} zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN setarch ${ARCH} zypper install -l -y $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index eadab8f65..a4f5d7552 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -6,11 +6,12 @@ ARG ARCH=x86_64
 # Add PACKMAN repository
 RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
 RUN zypper refresh
+RUN zypper --non-interactive dup
+RUN zypper --non-interactive update
 
 # Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN zypper remove -y openssl
-RUN zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN zypper install -l -y $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 4af3c361a..ab1f81b10 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -12,9 +12,9 @@ ccache
 cdparanoia
 cdparanoia-devel
 chmlib-devel
-cln-devel
 chrpath
 clamav
+cln-devel
 clucene-core-devel
 cmake
 createrepo
@@ -33,6 +33,7 @@ fftw3-devel
 file-devel
 flac-devel
 flex
+font-util
 freetype-devel
 fribidi-devel
 gamin-devel
@@ -54,6 +55,7 @@ htdig
 html2ps
 hunspell-devel
 ImageMagick-devel
+imake
 imlib2-devel
 intltool
 java-1_8_0-openjdk-devel
@@ -73,6 +75,7 @@ libdb-4_8-devel
 libdvdread-devel
 libexempi-devel
 libexiv2-devel
+libfontenc-devel
 libgadu-devel
 libgpgme-devel
 libgphoto2-devel
@@ -94,8 +97,8 @@ libmtp-devel
 libmusicbrainz-devel 
 libneon-devel
 libnjb-devel
-libopenssl-1_1_0-devel
 libofx-devel
+libopenssl-devel
 libotr-devel
 libpisock-devel
 libpng16-devel
@@ -115,13 +118,19 @@ libtiff-devel
 libtool
 libtwolame-devel
 libudev-devel
+libudisks2-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
 libwmf-devel
 libwpd-devel
+libXdmcp-devel
 libxine-devel
+libxkbfile-devel
+libXScrnSaver-devel
 libxslt-devel
+libXt-devel
+libXtst-devel
 lilo
 lirc-devel
 make
@@ -136,7 +145,7 @@ openexr-devel
 opensc
 openslp-devel
 opensp-devel
-openssl-1_1_0
+openssl
 pam-devel
 patch
 pciutils-devel
@@ -147,7 +156,7 @@ postgresql
 postgresql-devel
 python-devel
 python-sip-devel
-recode
+rpcgen
 rpm-build
 rsvg-view
 ruby
@@ -162,7 +171,6 @@ swig
 sword-devel
 torsocks
 transfig
-udisks2-devel
 unixODBC-devel
 update-desktop-files
 usbutils