RPM: update build scripts

pull/92/head
François Andriot 4 years ago
parent 685d3568bf
commit a01912d54a

1
redhat/.gitignore vendored

@ -1 +0,0 @@
*/*/patches

@ -13,11 +13,11 @@ 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}" =~ ${TDE_VERSION}_ ]] ; then
eval VERSION="${pkg_release/_0_/\~}"
else
# Base package (tdelibs ...)
eval VERSION="${pkg_version}${pkg_release/0_/\~}"
eval VERSION="${pkg_version}_${pkg_release/0_/\~}"
fi
VERSION="${VERSION%.opt}" # Remove '.opt' suffix

@ -11,7 +11,7 @@ PKGNAME="${1}"
if [ -x /usr/sbin/urpmi ]; then
PKGINST='sudo urpmi --auto --no-verify-rpm'
elif [ -x /usr/bin/dnf ]; then
PKGINST="sudo dnf install -y --refresh --nogpgcheck"
PKGINST="sudo dnf install -y --nogpgcheck"
elif [ -x /usr/bin/zypper ]; then
PKGINST="sudo zypper install -y"
elif [ -x /usr/bin/yum ]; then

@ -17,7 +17,7 @@ if [ "${BUILT/~/}" != "${BUILT}" ]; then
fi
# Nominal case: no "~" caracter
else
if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then
if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ ${TARBALL}_[0-9]* ]]; then
echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built."
exit 0
fi

@ -20,7 +20,7 @@ else
echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
exit 0
fi
# Other package (e.g. QT3)
if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then
echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."

@ -42,7 +42,7 @@ ADD rpmmacros /home/trinity/.rpmmacros
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm

@ -29,7 +29,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
docbook2X
docbook2x
doxygen
e2fsprogs-devel
emacs
@ -56,6 +56,7 @@ gnokii-devel
gperf
gpgme-devel
gphoto2-devel
gpsim-devel
GraphicsMagick-devel
gsl-devel
gstreamer-devel

@ -80,4 +80,4 @@ RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64//hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64//libyaz-5.14.11-14.el8.remi.x86_64.rpm
RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64//hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm

@ -29,6 +29,7 @@ db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
dnf-plugin-ovl
docbook2X
doxygen
dssi-devel
@ -65,6 +66,7 @@ gtk3-devel
gtk+-devel
gtk-doc
guile-devel
harfbuzz-devel
hspell-devel
htdig
html2ps
@ -130,6 +132,7 @@ libtool-ltdl-devel
libudev-devel
libudisks2-devel
libutempter-devel
libuuid-devel
libv4l-devel
libvisual-devel
libvncserver-devel
@ -163,6 +166,7 @@ net-tools
nspr-devel
ocaml
ocaml(compiler)
ocaml-facile-devel
OpenEXR-devel
openldap-devel
opensc
@ -187,6 +191,8 @@ postgresql
postgresql-devel
postgresql-server-devel
pulseaudio-libs-devel
python
python3-devel
qt4-devel
recode
redhat-rpm-config
@ -209,6 +215,7 @@ t1lib-devel
t1utils
taglib-devel
texinfo
texlive-newunicodechar
torsocks
transfig
udisks-devel

@ -179,7 +179,7 @@ pcsc-perl
perl
perl-devel
perl(ExtUtils::MakeMaker)
perl-PAR-Packer
perl(PAR::Packer)
perl(XML::Parser)
pilot-link-devel
pkcs11-helper-devel

@ -42,5 +42,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/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm
RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"

@ -147,6 +147,7 @@ libtwolame-devel
libudev-devel
libungif-devel
libusb1.0-devel
libutempter
libutempter0
libutempter-devel
libv4l-devel

@ -158,6 +158,7 @@ libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
libutempter
libvisual-devel
libvorbis-devel
libwmf-devel

@ -1,19 +1,21 @@
#!/bin/bash
NAME="opensuse32"
VERSION="$1" # E.g: '42.3'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
sudo rm -rf "${INSTALLROOT}"
sudo mkdir -p "${INSTALLROOT}"
if [ "${VERSION}" = "tumbleweed" ]; then
URL="http://download.opensuse.org/tumbleweed"
NAME="opensuse32/tumbleweed"
else
URL="http://download.opensuse.org/distribution/leap/${VERSION}"
NAME="opensuse32/leap"
fi
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
sudo rm -rf "${INSTALLROOT}"
sudo mkdir -p "${INSTALLROOT}"
sudo zypper --root "${INSTALLROOT}" \
ar "${URL}/repo/oss/" "oss"
sudo zypper --root "${INSTALLROOT}" \

@ -1,4 +1,4 @@
FROM opensuse32:tumbleweed
FROM opensuse32/tumbleweed:latest
ARG TDE_VERSION=14.0.7
ARG ARCH=i686

@ -1,4 +1,4 @@
FROM opensuse:tumbleweed
FROM opensuse/tumbleweed:latest
ARG TDE_VERSION=14.0.7
ARG ARCH=x86_64

@ -17,7 +17,7 @@ clamav
cln-devel
clucene-core-devel
cmake
createrepo
createrepo_c
cups-devel
cyrus-sasl-devel
dbus-1-devel
@ -155,6 +155,7 @@ net-tools
net-tools-deprecated
NetworkManager-devel
ocaml
openexr
openexr-devel
opensc
openslp-devel
@ -174,6 +175,7 @@ postgresql10-devel
python-devel
python-gtk-devel
python3-devel
recode
rpcgen
rpm-build
rsvg-convert

@ -45,4 +45,5 @@ RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm
RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|"
RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm

@ -1,72 +0,0 @@
This is a unsorted quick notes about TDE build issues, by distribution.
ALL DISTRIBUTIONS (or almost):
Some libraries are required but not provided by distribution anymore.
You can find them in "3rdparty" folder.
imlib1 : required for kuickshow
python-qt3 (also known as PyQt) : required for python-related packages (TDE 3.5.13 only, not R14)
hal : required for TDE 3.5.13.2, most recent distribution do NOT ship it.
wv2 : required for koffice
CENTOS 6:
ligogg-devel package is missing file '/usr/lib[64]/libogg.la'
Missing header 'jpegint.h'
MAGEIA 2/3:
Remove db4-devel and install db5-devel only.
Several version of postgresl-devel exist.
Ensure you have the latest one installed, or you will build against an old one !
MGA2: 9.1
MGA3: 9.2
MAGEIA 4:
Bug in /usr/lib[64]/pkgconfig/ruby.pc : missing "ruby_version:" value
Should be: ruby_version=2.0.0
MAGEIA 6:
if tdegraphics fails because of 'nullptr' undefined:
vi /usr/include/poppler/PDFDoc.h
add '#define nullptr NULL'
CENTOS 4 / CENTOS 5
Some mandatory packages are missing or too old.
I had to build newer version in order to have TDE function correctly.
curl (built as trinity-curl)
poppler (built as trinity-poppler)
OPENSUSE 11.x and 12.x
Missing cmake macros for RPM.
Manually copy file 'macros.cmake' from Fedora to '/etc/rpm'
Starting with OSS 13.1, the cmake macro is here.
OPENSUSE 13.1
Macro '%suse_version' has value 1230 instead of 1310. Need manual fixing.
OPENSUSE 11.4
Bug in 'libical-devel' package. (causes FTBFS in tdepim)
Edit file '/usr/lib/pkgconfig/libical.pc'
Then change as follow:
Cflags: -I${includedir}/libical
To avoid relinking error on i18n (e.g. rpmbuild fails in amarok), create symlink manually on build system:
for i in ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW; do
mkdir -p /opt/trinity/share/doc/tde/HTML/$i/common
done
FEDORA 20
kopete-otr: Missing 'libotr3' autotools macros. Need to put manually '.m4' file from source package in correct folder.
PCLINUXOS:
Many '.la' files are missing under '/usr/lib'. Need manual creation.
Loading…
Cancel
Save