summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2021-05-02 13:35:44 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2021-05-02 13:36:16 +0200
commite3454bb533b0e5364659ba636e39fe74bcd316b7 (patch)
treedeb3dfcb9329596ac78751c4ffd6960d828eb02b
parentc7623fbb061f477b19ddf24de3661203aa33c299 (diff)
downloadtde-packaging-e3454bb533b0e5364659ba636e39fe74bcd316b7.tar.gz
tde-packaging-e3454bb533b0e5364659ba636e39fe74bcd316b7.zip
RPM: update build scripts for opensuse TW
-rw-r--r--redhat/Makefile2
-rw-r--r--redhat/docker/osstw/Dockerfile.i6863
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_649
-rw-r--r--redhat/docker/osstw/packages2
4 files changed, 8 insertions, 8 deletions
diff --git a/redhat/Makefile b/redhat/Makefile
index 360583fa8..e1605066f 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -368,7 +368,7 @@ kkbswitch: tdebase
klamav: tdebase
# Requires clamav >= 0.101.0
-ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
+ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
$(call buildpkg,applications/klamav)
endif
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index e969d0d02..9b74d32ec 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -7,7 +7,6 @@ ARG ARCH=i686
COPY packages /packages
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
&& zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
- && setarch ${ARCH} zypper refresh \
&& setarch ${ARCH} zypper -n refresh \
&& setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n update \
@@ -18,7 +17,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index a289fae5d..aec6aeb62 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -4,9 +4,10 @@ ARG TDE_VERSION=14.1.0
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
-ADD packages /packages
-RUN zypper refresh \
+COPY packages /packages
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
+ && zypper -n refresh \
+ && zypper -n install busybox perl shadow \
&& zypper -n dup \
&& zypper -n update \
&& zypper -n install $(</packages)
@@ -16,7 +17,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 2f103ee95..623129a61 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -4,7 +4,6 @@ aspell-devel
audiofile-devel
automake
bdftopcf
-bind-devel
binutils-devel
bison
bluez-devel
@@ -17,6 +16,7 @@ cdparanoia-devel
chmlib-devel
chrpath
clamav
+clamav-devel
cln-devel
clucene-core-devel
cmake