Browse Source

RPM Packaging: update build scripts

tags/r14.0.0
François Andriot 5 years ago
parent
commit
41284c83ff

+ 3
- 3
redhat/Makefile.r14 View File

@@ -1,12 +1,12 @@
SHELL := /bin/bash
PATH := $(PATH)/build:$(shell pwd)
PATH := $(PATH):$(shell pwd)/build
TDE_VERSION = 14.0.0

buildpkg = \
@echo "Now processing '$(1)' ."; \
if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
echo " Package '${1}' is not yet installed."; \
if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
echo " Building package."; \
build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
echo " Updating repository."; \

+ 4
- 4
redhat/Makefile.v3.5.13-sru View File

@@ -1,12 +1,12 @@
SHELL := /bin/bash
PATH := $(PATH)/build:$(shell pwd)
PATH := $(PATH):$(shell pwd)/build
TDE_VERSION = 3.5.13.2

buildpkg = \
@echo "Now processing '$(1)' ."; \
if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
echo " Package '${1}' is not yet installed."; \
if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
echo " Building package."; \
build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
echo " Updating repository."; \
@@ -51,7 +51,7 @@ tqca: tqtinterface
tqca-tls: tqtinterface tqca
$(call buildpkg,dependencies/tqca-tls)

qt3:
qt3: esound
$(call buildpkg,dependencies/qt3)

tqtinterface: qt3

+ 2
- 0
redhat/build/build_rpm_package.sh View File

@@ -29,6 +29,7 @@ fi
[ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"

RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
SRPMDIR="$(rpm -E %{_srcrpmdir}.tde-${TDE_VERSION})"

rpmbuild -ba \
--define "_specdir ${TEMPDIR}" \
@@ -36,6 +37,7 @@ rpmbuild -ba \
--define "_builddir ${BUILDDIR}" \
--define "_buildrootdir ${BUILDROOTDIR}" \
--define "_rpmdir ${RPMDIR}" \
--define "_srcrpmdir ${SRPMDIR}" \
--define "tde_version ${TDE_VERSION}" \
--define "tde_prefix /opt/trinity" \
--define "preversion ${PREVERSION}" \

+ 10
- 2
redhat/build/configure_repository.sh View File

@@ -1,9 +1,10 @@
#!/bin/bash
#!/bin/bash -x

TDE_VERSION=${1:-14.0.0}
ARCH=$(uname -i)
ARCH=$(rpm -E %_target_cpu)
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})

# RHEL / CentOS / Fedora
if [ -x /usr/bin/yum ]; then
cat <<EOF >/tmp/rpmbuild-tde.repo
[rpmbuild.${ARCH}]
@@ -20,3 +21,10 @@ gpgcheck=0
EOF
sudo mv -f /tmp/rpmbuild-tde.repo /etc/yum.repos.d/
fi

# Mageia / Mandriva
if [ -x /usr/sbin/urpmi ]; then
sudo urpmi.removemedia -y "rpmbuild"
sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH}
sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch
fi

+ 1
- 1
redhat/build/get_installed_package_version.sh View File

@@ -7,7 +7,7 @@ PKGNAME="${1##*/}"

# Language package: install only French language package
case ${PKGNAME} in
"k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
"k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";;
"koffice") PKGNAME="${PKGNAME}-suite";;
"trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
"qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;

+ 1
- 1
redhat/build/get_latest_tarball_version.sh View File

@@ -7,7 +7,7 @@ TDE_VERSION="${2:-14.0.0}"

TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION})

[ ! -r "${TARBALL}" ] && echo "No tarball found for '${PKGNAME}' !" && exit 2
[ ! -r "${TARBALL}" ] && exit 2

VERSION=${TARBALL##*/}
VERSION=${VERSION#trinity-}

+ 1
- 1
redhat/build/get_rpm_package_name.sh View File

@@ -31,7 +31,7 @@ echo "${PREFIX}${PKGNAME}"

if [ -n "${DEVEL}" ]; then
# Check if development package is required.
# Applications do NOT have development packages
# Applications do NOT have development packages, except K3B
case "${PKGCATEGORY}" in
"applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
esac

+ 14
- 0
redhat/build/install_requires.sh View File

@@ -0,0 +1,14 @@
#!/bin/bash

PKGFILE="packages$(rpm -E %dist)"

# Under Mageia/Mandriva, do not forget to enable "Tainted" and "Nonfree" repositories !
if [ -x /usr/sbin/urpmi ]; then
if [ "$(uname -i)" = "x86_64" ]; then
PKGS="$(<${PKGFILE})"
else
PKGS="$(sed -e "s|lib64|lib|" ${PKGFILE} | sort -u)"
fi

sudo urpmi ${PKGS} 2>&1
fi

+ 1
- 0
redhat/build/is_latest_package_built.sh View File

@@ -5,6 +5,7 @@ TDE_VERSION="${2:-14.0.0}"

BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})
TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"

# If package version contains a "~": it's a pre-release
if [ "${BUILT/\~/}" != "${BUILT}" ]; then

+ 11
- 5
redhat/build/update_repository.sh View File

@@ -9,14 +9,20 @@ while [ -e "${LOCKFILE}" ]; do
sleep 3
done

ARCH="$(rpm -E %{_target_cpu})"
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})

[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"

if [ -x /usr/sbin/urpmi ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/zypper ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo --workers=${WORKERS} $(uname -i); createrepo --workers=${WORKERS} noarch; sudo zypper refresh rpmbuild.$(uname -i) rpmbuild.noarch)'
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
elif [ -x /usr/bin/apt-get ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)'
fi

eval "${REPOUPDATE}; rm -f ${LOCKFILE}"|| exit 1
eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1

+ 191
- 292
redhat/packages.mga View File

@@ -1,326 +1,225 @@
rpm-build
GraphicsMagick-devel
ImageMagick-devel
NetworkManager-glib-devel
OpenEXR-devel
SDL-devel
X11-devel
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
bind-devel
bison
boost-devel
bzip2-devel
ccache
ccrtp-devel
cdparanoia
chrpath
cmake
mysql-devel
unixODBC-devel
libpq-devel
freetype2-devel
mesaglu-devel
libsm-devel
libice-devel
libx11-devel
libxcursor-devel
libxext-devel
libxft-devel
libxinerama-devel
libxmu-devel
libxrandr-devel
libxrender-devel
fontconfig-devel
bzip2-devel
libjpeg-devel
libmng-devel
pkgconfig(libpng15)
zlib-devel
nas-devel
libiodbc-devel
glib2-devel
python-devel
perl(XML::Parser)
gtk-doc
libblkid-devel
pciutils-devel
xmlto
gperf
libv4l-devel
expat-devel
cmake
cups-devel
curl-devel
db5-devel
dbus-devel
dbus-glib
dbus-glib-devel
libusb-devel
libudev-devel
cups-devel
cmake
libgsf-devel
pth-devel
libxi-devel
audiofile-devel
gsl-devel
alsa-lib-devel
libvorbis-devel
djvulibre
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
doxygen
drakconf
dssi-devel
esound-devel
libjack-devel
libmad-devel
pkgconfig(audiofile)
expat-devel
fftw-devel
flex
fontconfig-devel
freetype-devel
freetype2-devel
fribidi-devel
gamin-devel
gettext-devel
libcurl-devel
glib2-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
gsl-devel
gtk-doc
gtk2-devel
libxslt-devel
libart_lgpl-devel
aspell
aspell-devel
gamin-devel
libutempter-devel
hspell-devel
libjasper-devel
OpenEXR-devel
libraw1394-devel
lm_sensors-devel
hal-devel
libxscrnsaver1-devel
lib64xscrnsaver1-devel
libsmbclient-devel
hspell-devel
imake
libxkbfile-devel
libfontenc-devel
libxtst6-devel
lib64xtst6-devel
x11-font-util
xulrunner-devel
ruby-devel
java-openjdk
java-devel
imlib1-devel
java-1.6.0-openjdk-devel
java-1.7.0-openjdk-devel
perl-devel
libtheora-devel
taglib-devel
cdparanoia
libcdda-devel
libflac-devel
java-devel
java-openjdk
karma-sharp
lib64OpenSP5-devel
lib64binutils-devel
lib64clucene-devel
lib64commoncpp-devel
lib64curl-devel
lib64dvdread-devel
lib64exiv2-devel
lib64expat1-devel
lib64ffmpeg-devel
lib64flac++-devel
lib64flac-devel
libgstreamer0.10-devel
lib64gstreamer0.10-devel
libxxf86dga-devel
lib64xxf86dga-devel
libxine1.2-devel
lib64xine1.2-devel
gnokii-devel
gpgme-devel
flex
libical-devel
boost-devel
rpm-devel
lilo
xscreensaver
xscreensaver-base
xscreensaver-extrusion
xscreensaver-gl
net-snmp-devel
libungif-devel
gphoto2-devel
libpaper-devel
libt1lib-devel
libsane1-devel
freetype-devel
libpoppler-devel
fribidi-devel
lib64sane1-devel
lib64inotifytools-devel
lib64iw29-devel
lib64jasper-devel
lib64lame-devel
lib64mad-devel
lib64paper-devel
lib64poppler-devel
ocaml
subversion-devel
neon-devel
lib64binutils-devel
SDL-devel
db5-devel
sqlite-devel
sqlite3-devel
libgadu-devel
libiw-devel
openslp-devel
valgrind
lib64pulseaudio-devel
lib64sane1-devel
lib64t1lib-devel
lib64twolame-devel
lib64v4l-devel
lib64xaw-devel
lib64xi-devel
lib64xine1.2-devel
lib64xscrnsaver1-devel
lib64xtst6-devel
lib64xxf86dga-devel
lib64yaz-devel
libOpenSP5-devel
libart_lgpl-devel
libblkid-devel
libcdda-devel
libclucene-devel
libcommoncpp-devel
libcurl-devel
libdvdread-devel
libexiv2-devel
transfig
djvulibre
librsvg
libwmf-devel
netpbm
python-sip
python-qt
bison
libtiff-devel
libffmpeg-devel
libflac++-devel
libflac-devel
libfontenc-devel
libgadu-devel
libgpod-devel
libgsf-devel
libgstreamer-plugins-base-devel
libgstreamer0.10-devel
libhd-devel
libical-devel
libice-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
libiw-devel
libjack-devel
libjasper-devel
libjpeg-devel
libkarma-devel
karma-sharp
libgpod-devel
liblame-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libnjb-devel
libvisual-devel
libinotifytools-devel
libmp4v2-devel
libclucene-devel
sword-devel
libmpcdec-devel
libsndfile-devel
libdvdread-devel
libflac++-devel
liblame-devel
libffmpeg-devel
libgstreamer-plugins-base-devel
ImageMagick-devel
doxygen
GraphicsMagick-devel
libwpd-devel
wv2-devel
recode
libofx-devel
libOpenSP5-devel
docbook-style-xsl
libotr-devel
yaz
lib64yaz-devel
subversion-devel
dssi-devel
liblo-devel
liblrdf-devel
lirc-devel
scons
subversion-devel
pilot-link-devel
libhd-devel
lib64commoncpp-devel
ccrtp-devel
libzrtpcpp-devel
bind-devel
libcommoncpp-devel
unixODBC-devel
libotr3-devel
libpaper-devel
libpoppler-devel
libpq-devel
mesaglu-devel
libxmu-devel
bzip2-devel
pkgconfig(libpng15)
nas-devel
libiodbc-devel
postgresql9.2-devel
cups-devel
cmake
pth-devel
lib64xi-devel
gsl-devel
lib64mad-devel
esound-devel
libmad-devel
docbook-dtd412-xml
docbook-utils
gettext-devel
lib64expat1-devel
libxslt-devel
aspell
aspell-devel
libutempter-devel
hspell-devel
lib64jasper-devel
OpenEXR-devel
libraw1394-devel
pam-devel
libusb-devel
openldap-devel
lm_sensors-devel
libudev-devel
hal-devel
lib64xscrnsaver1-devel
librsvg
libsane1-devel
libsm-devel
libsmbclient-devel
imake
libsndfile-devel
libt1lib-devel
libtheora-devel
libtiff-devel
libtunepimp-devel
libudev-devel
libungif-devel
libusb-devel
libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libx11-devel
libxcursor-devel
libxext-devel
libxft-devel
libxi-devel
libxine1.2-devel
libxinerama-devel
libxkbfile-devel
libfontenc-devel
libxmu-devel
libxrandr-devel
libxrender-devel
libxscrnsaver1-devel
libxslt-devel
libxtst-devel
x11-font-util
gnokii-devel
gpgme-devel
libical-devel
boost-devel
curl-devel
gtk2-devel
lib64curl-devel
lib64flac-devel
lib64pulseaudio-devel
libxtst6-devel
libxv-devel
libxxf86dga-devel
libyaz-devel
libzrtpcpp-devel
lilo
lirc-devel
lm_sensors-devel
mesaglu-devel
mysql-devel
nas-devel
neon-devel
net-snmp-devel
netpbm
ocaml
openldap-devel
openslp-devel
opensp-devel
pam-devel
pciutils-devel
perl(XML::Parser)
perl-devel
pilot-link-devel
pkgconfig(audiofile)
pkgconfig(libpng15)
pkgconfig(libpng16)
postgresql9.2-devel
pth-devel
python-devel
python-qt
python-sip
readline-devel
recode
rpm-build
rpm-devel
ruby-devel
scons
speex-devel
libtheora-devel
sqlite-devel
sqlite3-devel
subversion-devel
sword-devel
taglib-devel
cdparanoia
libcdda-devel
lib64gstreamer0.10-devel
lib64xxf86dga-devel
lib64lame-devel
rpm-devel
SDL-devel
transfig
unixODBC-devel
valgrind
wv2-devel
x11-font-util
xmlto
xscreensaver
xscreensaver-base
xscreensaver-extrusion
xscreensaver-gl
xulrunner-devel
ruby-devel
java-openjdk
java-devel
java-1.6.0-openjdk-devel
perl-devel
ocaml
libgadu-devel
lib64iw29-devel
openslp-devel
lib64v4l-devel
subversion-devel
neon-devel
lib64binutils-devel
net-snmp-devel
libungif-devel
gphoto2-devel
lib64paper-devel
lib64t1lib-devel
lib64sane1-devel
freetype-devel
lib64poppler-devel
fribidi-devel
lib64exiv2-devel
transfig
djvulibre
librsvg
libwmf-devel
X11-devel
lib64commoncpp-devel
readline-devel
bind-devel
bison
doxygen
libcommoncpp-devel
ImageMagick-devel
GraphicsMagick-devel
libwpd-devel
wv2-devel
libmpcdec-devel
libmusicbrainz-devel
lib64dvdread-devel
lib64flac++-devel
lib64ffmpeg-devel
chrpath
yaz
libyaz-devel
pilot-link-devel
fftw-devel
dssi-devel
liblo-devel
liblrdf-devel
lirc-devel
libotr3-devel
scons
libifp-devel
libkarma-devel
karma-sharp
libgpod-devel
libmtp-devel
libnjb-devel
libvisual-devel
libtunepimp-devel
lib64inotifytools-devel
libmp4v2-devel
lib64twolame-devel
docbook-style-xsl
recode
libofx-devel
lib64OpenSP5-devel
lib64clucene-devel
sword-devel
drakconf
imlib1-devel
NetworkManager-glib-devel
lib64xaw-devel
libxv-devel
zlib-devel

+ 199
- 0
redhat/packages.mga4 View File

@@ -0,0 +1,199 @@
GraphicsMagick-devel
ImageMagick-devel
NetworkManager-glib-devel
OpenEXR-devel
SDL-devel
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
bind-devel
bison
boost-devel
bzip2-devel
ccache
cdparanoia
chrpath
cmake
cups-devel
curl-devel
db5-devel
dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
doxygen
drakconf
dssi-devel
expat-devel
fftw-devel
flex
fontconfig-devel
freetype-devel
freetype2-devel
fribidi-devel
gamin-devel
gettext-devel
glib2-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
gsl-devel
gtk-doc
gtk2-devel
hspell-devel
imake
java-1.7.0-openjdk
java-1.7.0-openjdk-devel
karma-sharp
lcms-devel
lib64binutils-devel
lib64clucene-devel
lib64commoncpp-devel
lib64curl-devel
lib64dvdread-devel
lib64ecpg9.3_6
lib64exiv2-devel
lib64ffmpeg-devel
lib64flac++-devel
lib64flac-devel
lib64fontenc-devel
lib64gstreamer0.10-devel
lib64inotifytools-devel
lib64jasper-devel
lib64jpeg-devel
lib64lame-devel
lib64mad-devel
lib64paper-devel
lib64poppler-devel
lib64pulseaudio-devel
lib64sane1-devel
lib64t1lib-devel
lib64tiff-devel
lib64twolame-devel
lib64udev-devel
lib64usb-devel
lib64v4l-devel
lib64xaw-devel
lib64xi-devel
lib64xine1.2-devel
lib64xscrnsaver-devel
lib64xtst-devel
lib64xxf86dga-devel
lib64yaz-devel
libart_lgpl-devel
libblkid-devel
libcdda-devel
libclucene-devel
libcommoncpp-devel
libcurl-devel
libdvdread-devel
libffmpeg-devel
libflac++-devel
libflac-devel
libgadu-devel
libgpod-devel
libgsf-devel
libgstreamer-plugins-base-devel
libhd-devel
libical-devel
libice-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
libiw-devel
libjack-devel
libjasper-devel
libkarma-devel
liblame-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libnjb-devel
libofx-devel
libpaper-devel
libraw1394-devel
librsvg
libsm-devel
libsmbclient-devel
libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
libutempter-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libx11-devel
libxcursor-devel
libxext-devel
libxft-devel
libxi-devel
libxinerama-devel
libxkbfile-devel
libxmu-devel
libxrandr-devel
libxrender-devel
libxslt-devel
libxv-devel
libxxf86dga-devel
libyaz-devel
lilo
lirc-devel
lm_sensors-devel
mesaglu-devel
mysql-devel
nas-devel
neon-devel
net-snmp-devel
netpbm
ocaml
openldap-devel
openslp-devel
opensp-devel
pam-devel
pciutils-devel
perl(XML::Parser)
perl-devel
pilot-link-devel
pkgconfig(audiofile)
pkgconfig(libpng16)
postgresql9.3
postgresql9.3-devel
pth-devel
python-devel
python-sip
readline-devel
recode
rpm-build
rpm-devel
ruby-devel
scons
speex-devel
sqlite-devel
sqlite3-devel
subversion-devel
sword-devel
taglib-devel
transfig
unixODBC-devel
valgrind
wv2-devel
x11-font-util
xmlto
xscreensaver
xscreensaver-base
xscreensaver-extrusion
xscreensaver-gl
yaz
zlib-devel

+ 1
- 0
redhat/packages.oss View File

@@ -167,3 +167,4 @@ recode
NetworkManager-devel
update-desktop-files
pcsc-lite-devel
libconfig-devel

Loading…
Cancel
Save