diff options
| -rw-r--r-- | redhat/applications/kaffeine/kaffeine.spec | 25 | ||||
| -rwxr-xr-x | redhat/build/gather_rpm_sources.sh | 2 | ||||
| -rw-r--r-- | redhat/docker/el5/Dockerfile.i686 | 124 | ||||
| -rw-r--r-- | redhat/docker/el5/Dockerfile.x86_64 | 117 | ||||
| -rw-r--r-- | redhat/docker/el5/packages | 2 | ||||
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork.spec | 4 |
6 files changed, 204 insertions, 70 deletions
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec index 39bc1362b..58e9424b3 100644 --- a/redhat/applications/kaffeine/kaffeine.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -114,8 +114,20 @@ BuildRequires: libXext-devel BuildRequires: libXtst-devel BuildRequires: libXinerama-devel %endif -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: libxcb-devel + +# XCB support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} == 0 +%define with_xcb 1 +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} +BuildRequires: libxcb-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} == 0 +BuildRequires: %{_lib}xcb-devel +%endif +%endif %endif # GSTREAMER support @@ -178,6 +190,11 @@ BuildRequires: lame-devel %endif %endif +# DVB support +%if 0%{?rhel} != 5 +%define with_dvb 1 +%endif + # WTF support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?pclinuxos} == 0 @@ -286,11 +303,13 @@ fi -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -DWITH_ALL_OPTIONS=ON \ + %{?!with_dvb:-DWITH_DVB=OFF} \ %{?!with_lame:-DWITH_LAME=OFF} \ + %{?!with_xcb:-DWITH_XCB=OFF} \ -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 22adfa972..8c16c56f4 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -32,7 +32,7 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}" PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1" if [ -d "${PATCHDIR}" ]; then - cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch" + cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch" sed -i "${TARGETDIR}/"*".spec" \ -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ -e "/%setup/ s/$/\n%patch389 -p1/" diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 3b879e8a8..035d8057f 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -4,29 +4,113 @@ ARG TDE_VERSION=14.0.10 ARG ARCH=i686 # Add local repositories -RUN rm -f /etc/yum.repos.d/*.repo -ADD centos-5.repo /etc/yum.repos.d/centos-5.repo -ADD epel-5.repo /etc/yum.repos.d/epel-5.repo -ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo - -# Install Trinity build dependencies -ADD packages.trinity /etc/yum.repos.d/packages -#RUN yum install -y setarch -RUN setarch ${ARCH} yum update -y -RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || : +COPY packages /packages +RUN rpm -Uvh --force http://repo/repo/archives/centos/5/os/i386/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.i386.rpm \ + && echo "multilib_policy=best" >>/etc/yum.conf \ + && cd /etc/yum.repos.d \ + && rm -fv *.repo \ + && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \ + && rpm -e --nodeps --justdb libselinux \ + && setarch ${ARCH} yum -y update \ + && setarch ${ARCH} yum -y install $(</packages) || : # Avoid conflict with gnome-screensaver -RUN setarch ${ARCH} yum remove -y gnome-screensaver -RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver +RUN setarch ${ARCH} yum -y remove gnome-screensaver \ + && setarch ${ARCH} yum -y install --disablerepo="*" --enablerepo="centos-extras" xscreensaver -# 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" +# Updated build tools (not provided in centos5) +# Distro-specific patches +RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,i686/m4-1.4.13-5.el5.i386}.rpm \ + && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/i686/trinity-poppler{,-devel}-0.12.4-1.el5.i386.rpm \ + && chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" # 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 +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +# Fix sudo running in docker +RUN sed -i "/etc/sudoers" -e "/requiretty/ s|^|#|" + +# Use GCC 4.4 by default +RUN rm -f /usr/bin/gcc && ln -sf /usr/bin/gcc44 /usr/bin/gcc \ + && rm -f /usr/bin/g++ && ln -sf /usr/bin/g++44 /usr/bin/g++ \ + && rm -f /usr/bin/c++ && ln -sf /usr/bin/g++44 /usr/bin/c++ + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros +RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS} + +# Build development tools +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/cmake-2.8.12.2-4.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/cmake-2.8.12.2-4.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/cmake.spec --without gui \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cmake-2*.rpm \ + && rm -fv /tmp/*.src.rpm \ + && sudo sed -i "/usr/share/cmake/Modules/FindGTK2.cmake" -e "/GTK2_GIO/ s|^|#|" + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/binutils-2.20.51.0.2-5.48.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \ + && rm -fv /tmp/*.src.rpm + +# Build dependencies +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/file-5.04-30.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 32" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/sword-1.7.3-2.el6.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/gnuchess-5.07-14.1.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/exempi-2.1.0-5.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/pilot-link-0.12.4-6.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm \ + && rm -fv /tmp/*.src.rpm diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 280fcea33..36543d83c 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -5,10 +5,10 @@ ARG ARCH=x86_64 # Add local repositories COPY packages /packages -RUN rpm -Uvh http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \ +RUN rpm -Uvh --force http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \ && echo "multilib_policy=best" >>/etc/yum.conf \ && cd /etc/yum.repos.d \ - && rm -f *.repo \ + && rm -fv *.repo \ && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \ && rpm -e --nodeps --justdb libselinux \ && yum -y update \ @@ -29,57 +29,88 @@ RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5 RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +# Fix sudo running in docker +RUN sed -i "/etc/sudoers" -e "/requiretty/ s|^|#|" + +# Use GCC 4.4 by default +RUN rm -f /usr/bin/gcc && ln -sf /usr/bin/gcc44 /usr/bin/gcc \ + && rm -f /usr/bin/g++ && ln -sf /usr/bin/g++44 /usr/bin/g++ \ + && rm -f /usr/bin/c++ && ln -sf /usr/bin/g++44 /usr/bin/c++ + USER trinity COPY rpmmacros /home/trinity/.rpmmacros RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS} -# Build development packages -RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm - -RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm - -RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ +# Build development tools +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/cmake-2.8.12.2-4.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/cmake-2.8.12.2-4.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/cmake.spec --without gui \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cmake-2*.rpm \ + && rm -fv /tmp/*.src.rpm \ + && sudo sed -i "/usr/share/cmake/Modules/FindGTK2.cmake" -e "/GTK2_GIO/ s|^|#|" + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/binutils-2.20.51.0.2-5.48.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \ + && rm -fv /tmp/*.src.rpm + +# Build dependencies +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/file-5.04-30.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm \ + && rm -fv /tmp/*.src.rpm -RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \ +RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/sword-1.7.3-2.el6.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm - -RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm - -RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/gnuchess-5.07-14.1.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-PAR-1.015-4.el7.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm \ + && rm -fv /tmp/*.src.rpm -RUN rpm -i --nomd5 http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ +RUN wget -nv -P /tmp http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm \ + && rm -fv /tmp/*.src.rpm -RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ +RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && rpm -ivh --nomd5 /tmp/perl-PAR-Packer-1.041-2.el7.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps - -RPM rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps \ + && rm -fv /tmp/*.src.rpm + +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/exempi-2.1.0-5.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \ + && rm -fv /tmp/*.src.rpm -RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm - - -# sudo rm -f /usr/bin/gcc && sudo ln -sf /usr/bin/gcc44 /usr/bin/gcc -# sudo rm -f /usr/bin/g++ && sudo ln -sf /usr/bin/g++44 /usr/bin/g++ -# sudo rm -f /usr/bin/c++ && sudo ln -sf /usr/bin/g++44 /usr/bin/c++ +RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ + && rpm -ivh --nomd5 /tmp/pilot-link-0.12.4-6.el6.src.rpm \ + && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm \ + && rm -fv /tmp/*.src.rpm diff --git a/redhat/docker/el5/packages b/redhat/docker/el5/packages index dbbe2f017..90d09f929 100644 --- a/redhat/docker/el5/packages +++ b/redhat/docker/el5/packages @@ -115,6 +115,7 @@ libogg-devel libotr-devel libpaper-devel libpqxx-devel +libqalculate-devel libraw1394-devel librsvg2-devel libsamplerate-devel @@ -218,6 +219,7 @@ vim-enhanced wireless-tools-devel xine-lib-devel xinetd +xmlrpc-c-devel xmlto xorg-x11-font-utils xorg-x11-server-utils diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 0ef8f695a..5c4c8b761 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -260,9 +260,7 @@ BuildRequires: speex-devel %endif # Build kopete motionaway plugin -%if 0%{?rhel} == 5 -%define build_kopete_motionaway 0 -%else +%if 0%{?rhel} != 5 %define build_kopete_motionaway 1 %endif |