RPM: update build scripts

4 files changed, 63 insertions, 56 deletions

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 $(</packages)
 # Enable ccache
 RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
 
+# 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
@@ -28,7 +31,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/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 $(</packages)
 # Enable ccache
 RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
 
+# 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
@@ -28,7 +31,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/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