From 0d023ac2af69714bf99c9521747c405fe6c1c055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 3 Oct 2021 11:23:41 +0200 Subject: [PATCH] RPM: add build scripts for Fedora 35 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/Makefile | 4 +- .../build/get_latest_built_package_version.sh | 3 +- redhat/docker/f34/Dockerfile.x86_64 | 5 +- redhat/docker/f35/Dockerfile.x86_64 | 36 +++ redhat/docker/f35/packages | 236 ++++++++++++++++++ redhat/docker/f35/rpmbuild.repo | 11 + redhat/docker/f35/rpmmacros | 6 + 7 files changed, 295 insertions(+), 6 deletions(-) create mode 100644 redhat/docker/f35/Dockerfile.x86_64 create mode 100644 redhat/docker/f35/packages create mode 100644 redhat/docker/f35/rpmbuild.repo create mode 100644 redhat/docker/f35/rpmmacros diff --git a/redhat/Makefile b/redhat/Makefile index fdc1b838d..41d7de88b 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -114,7 +114,7 @@ tdenetwork: tdebase rdesktop tdepim: tdebase libcaldav libcarddav $(call buildpkg,main/tdepim) -tdesdk: tdebase tdebindings +tdesdk: tdebase tdebindings tdepim $(call buildpkg,main/tdesdk) tdetoys: tdebase @@ -181,7 +181,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35)) $(call buildpkg,3rdparty/wv2) endif diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index 06a150913..8c96be4ca 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -13,7 +13,7 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")" pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")" # Application packages: version does not match TDE version -if [[ "${pkg_release}" =~ ^0_ ]]; then +if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then # Preversion if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then # Likely application package @@ -22,6 +22,7 @@ if [[ "${pkg_release}" =~ ^0_ ]]; then # Likely core package eval VERSION="${pkg_version}${pkg_release/0_/\~}" fi + VERSION="${VERSION/_~/\~}" else # Stable version if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index e86d2a75d..3b1aee7d6 100644 --- a/redhat/docker/f34/Dockerfile.x86_64 +++ b/redhat/docker/f34/Dockerfile.x86_64 @@ -18,9 +18,8 @@ COPY 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" # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter - -RUN chmod 777 /tmp +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 new file mode 100644 index 000000000..b4a34b522 --- /dev/null +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -0,0 +1,36 @@ +FROM fedora:35 + +ARG TDE_VERSION=14.0.10 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-35.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages new file mode 100644 index 000000000..619279797 --- /dev/null +++ b/redhat/docker/f35/packages @@ -0,0 +1,236 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +createrepo +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libqalculate-devel +libpqxx-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +poppler-devel +postgresql +postgresql-devel +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f35/rpmbuild.repo b/redhat/docker/f35/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f35/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros new file mode 100644 index 000000000..f8169a30e --- /dev/null +++ b/redhat/docker/f35/rpmmacros @@ -0,0 +1,6 @@ +%dist .fc35 +%_smp_mflags -j8 +%jobs 8 +%__cmake_builddir %nil +%_debugsource_packages %nil +%_debugsource_template %nil