summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/docker/mga6/Dockerfile.i6862
-rw-r--r--redhat/docker/mga6/packages.i6869
-rw-r--r--redhat/docker/mga6/packages.x86_649
-rw-r--r--redhat/docker/mga6/rpmmacros1
-rw-r--r--redhat/docker/mga7/packages.i6862
-rw-r--r--redhat/main/tdebase/tdebase.spec4
6 files changed, 14 insertions, 13 deletions
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index 02446d0ac..e10433ead 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -45,5 +45,5 @@ RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSI
RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
# Build development packages that are missing
-RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm
RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 61e69a9d6..3e88f77a7 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -24,10 +24,10 @@ dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
-docbook2x
doxygen
drakconf
dssi-devel
@@ -86,9 +86,9 @@ libgstreamer-plugins-base1.0-devel
libinotifytools-devel
libjasper-devel
libjpeg-devel
-libmp3lame-devel
liblua-devel
libmad-devel
+libmp3lame-devel
libpaper-devel
libpkcs11-helper-devel
libpoppler-devel
@@ -121,13 +121,13 @@ libdvdread-devel
libffmpeg-devel
libflac-devel
libflac++-devel
-libidn-devel
libgadu-devel
libgpod-devel
libgsf-devel
libhd-devel
libical-devel
libice-devel
+libidn-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
@@ -157,6 +157,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
+libutempter
libvisual-devel
libvorbis-devel
libwmf-devel
@@ -225,8 +226,8 @@ SDL-devel
speex-devel
sqlite3-devel
sqlite-devel
-sudo
subversion-devel
+sudo
sword-devel
taglib-devel
torsocks
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 0e8e91ad2..f77944bae 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -24,10 +24,10 @@ dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
+docbook2x
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
-docbook2x
doxygen
drakconf
dssi-devel
@@ -86,9 +86,9 @@ lib64gstreamer-plugins-base1.0-devel
lib64inotifytools-devel
lib64jasper-devel
lib64jpeg-devel
-lib64mp3lame-devel
lib64lua-devel
lib64mad-devel
+lib64mp3lame-devel
lib64paper-devel
lib64pkcs11-helper-devel
lib64poppler-devel
@@ -121,13 +121,13 @@ libdvdread-devel
libffmpeg-devel
libflac-devel
libflac++-devel
-libidn-devel
libgadu-devel
libgpod-devel
libgsf-devel
libhd-devel
libical-devel
libice-devel
+libidn-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
@@ -157,6 +157,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
+libutempter
libvisual-devel
libvorbis-devel
libwmf-devel
@@ -225,8 +226,8 @@ SDL-devel
speex-devel
sqlite3-devel
sqlite-devel
-sudo
subversion-devel
+sudo
sword-devel
taglib-devel
torsocks
diff --git a/redhat/docker/mga6/rpmmacros b/redhat/docker/mga6/rpmmacros
index 87fb3a9b9..427abf5c4 100644
--- a/redhat/docker/mga6/rpmmacros
+++ b/redhat/docker/mga6/rpmmacros
@@ -1,3 +1,4 @@
%dist .mga6
%_smp_mflags -j8
%jobs 8
+%_program_prefix ""
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index 5b196d053..4cc4376ae 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -86,8 +86,6 @@ libecpg9.6_6
libexiv2-devel
libfbclient-devel
libffmpeg-devel
-libffmpeg-devel
-libflac++-devel
libflac++-devel
libflac-devel
libflac-devel
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 416c7f3a4..2095a743d 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -2279,7 +2279,7 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/tdm
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
/usr/lib/systemd/system/tdm.service
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
@@ -3562,7 +3562,7 @@ fi
%endif
# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif