| 41284c83 | 2014-04-15 12:43:15 | François Andriot |
RPM Packaging: update build scripts |
||
|
A redhat/build/install_requires.sh A redhat/packages.mga4 M redhat/Makefile.r14 M redhat/Makefile.v3.5.13-sru M redhat/build/build_rpm_package.sh M redhat/build/configure_repository.sh M redhat/build/get_installed_package_version.sh M redhat/build/get_latest_tarball_version.sh M redhat/build/get_rpm_package_name.sh M redhat/build/is_latest_package_built.sh M redhat/build/update_repository.sh M redhat/packages.mga M redhat/packages.oss |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 57c9d56..ab00f4b 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -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."; \
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
index 6f13212..c8c2e61 100644
--- a/redhat/Makefile.v3.5.13-sru
+++ b/redhat/Makefile.v3.5.13-sru
@@ -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-tls: tqtinterface tqca
$(call buildpkg,dependencies/tqca-tls)
-qt3:
+qt3: esound
$(call buildpkg,dependencies/qt3)
tqtinterface: qt3
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 5d9a7d6..d55075f 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -29,6 +29,7 @@
[ -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 @@
--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}" \
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 2456b1a..22ddaf4 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -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 @@
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
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 62dbb1f..c7c5540 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -7,7 +7,7 @@
# 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";;
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index b12d63c..6c41f0a 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -7,7 +7,7 @@
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-}
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 14a32f2..7127329 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -31,7 +31,7 @@
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
diff --git a/redhat/build/install_requires.sh b/redhat/build/install_requires.sh
new file mode 100755
index 0000000..9c901ac
--- /dev/null
+++ b/redhat/build/install_requires.sh
@@ -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
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 1950aa9..5f9a442 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -5,6 +5,7 @@
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
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index c651fc3..1f22161 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -9,14 +9,20 @@
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
diff --git a/redhat/packages.mga b/redhat/packages.mga
index aa4757f..bc3ae9d 100644
--- a/redhat/packages.mga
+++ b/redhat/packages.mga
@@ -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
+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
+esound-devel
+expat-devel
+fftw-devel
+flex
+fontconfig-devel
+freetype-devel
freetype2-devel
-mesaglu-devel
-libsm-devel
+fribidi-devel
** Diff limit reached (max: 250 lines) **
|
||
| ffc65bec | 2014-04-15 12:44:15 | François Andriot |
RPM Packaging: update 3.5.13.2 packages |
||
|
M redhat/applications/kaffeine/kaffeine-3.5.13.2.spec M redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec M redhat/tdebase/tdebase-3.5.13.2.spec M redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec |
||
** Diff limit reached (max: 250 lines) ** |
||
| 0905036a | 2014-04-15 12:44:33 | François Andriot |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
M debian/lenny/dependencies/qt3/debian/control M debian/lenny/dependencies/qt3/debian/rules M debian/lenny/dependencies/tqt3/debian/control M debian/lenny/dependencies/tqt3/debian/rules M debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/lenny/tdebindings/debian/control M debian/squeeze/dependencies/qt3/debian/control M debian/squeeze/dependencies/qt3/debian/rules M debian/squeeze/dependencies/tqt3/debian/control M debian/squeeze/dependencies/tqt3/debian/rules M debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/squeeze/tdebindings/debian/control M debian/wheezy/dependencies/qt3/debian/control M debian/wheezy/dependencies/qt3/debian/rules M debian/wheezy/dependencies/tqt3/debian/control M debian/wheezy/dependencies/tqt3/debian/rules M debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/wheezy/tdebindings/debian/control M ubuntu/maverick/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/rules M ubuntu/maverick/dependencies/tqt3/debian/control M ubuntu/maverick/dependencies/tqt3/debian/rules M ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/maverick/tdebindings/debian/control M ubuntu/precise/dependencies/qt3/debian/control M ubuntu/precise/dependencies/qt3/debian/rules M ubuntu/precise/dependencies/tqt3/debian/control M ubuntu/precise/dependencies/tqt3/debian/rules M ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/precise/tdebindings/debian/control M ubuntu/raring/dependencies/qt3/debian/control M ubuntu/raring/dependencies/qt3/debian/rules M ubuntu/raring/dependencies/tqt3/debian/control M ubuntu/raring/dependencies/tqt3/debian/rules M ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/raring/tdebindings/debian/control |
||
** Diff limit reached (max: 250 lines) ** |
||