RPM: update build scripts for opensuse TW

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
 

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} \

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} \

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