summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2016-11-07 21:03:13 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2016-11-07 21:03:13 +0100
commit706d6bb5171732ccbe4e670a94e7c65d34f5a685 (patch)
tree19059dfd10684625aca30b14164ce60f10760e3a
parent69bf36171efd6a728323049cf80acc8216a5d3e2 (diff)
downloadtde-packaging-706d6bb5171732ccbe4e670a94e7c65d34f5a685.tar.gz
tde-packaging-706d6bb5171732ccbe4e670a94e7c65d34f5a685.zip
RPM packaging: update build scripts
-rw-r--r--redhat/Makefile.r1420
-rwxr-xr-xredhat/build/get_rpm_package_name.sh5
-rwxr-xr-xredhat/build/update_repository.sh6
-rw-r--r--redhat/buildenv.sh2
4 files changed, 26 insertions, 7 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index f23536467..2410c346e 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -53,7 +53,7 @@ libcaldav: tqtinterface autoconf libcurl
libcarddav: tqtinterface autoconf libcurl
$(call buildpkg,dependencies/libcarddav)
-
+
libr:
$(call buildpkg,dependencies/libr)
@@ -289,7 +289,10 @@ libksquirrel: tdelibs
$(call buildpkg,libraries/libksquirrel)
libtdeldap: tqtinterface
+# Do NOT build on PCLOS
+ifeq ($(wildcard /etc/pclinuxos-release),)
$(call buildpkg,libraries/libtdeldap)
+endif
libtqt-perl: tqtinterface
$(call buildpkg,libraries/libtqt-perl)
@@ -401,13 +404,22 @@ kcmautostart: tdebase
$(call buildpkg,applications/kcmautostart)
kcmldap: tdebase libtdeldap
+# Do NOT build on CentOS 5, PCLinuxOS
+ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),)
$(call buildpkg,applications/kcmldap)
+endif
kcmldapcontroller: tdebase kcmldap
+# Do NOT build on CentOS 5, PCLinuxOS
+ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),)
$(call buildpkg,applications/kcmldapcontroller)
+endif
kcmldapmanager: tdebase kcmldap
+# Do NOT build on CentOS 5, PCLinuxOS
+ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),)
$(call buildpkg,applications/kcmldapmanager)
+endif
kcpuload: tdebase
$(call buildpkg,applications/kcpuload)
@@ -431,7 +443,10 @@ keep: tdebase
$(call buildpkg,applications/keep)
kerberostray: tdebase
+# Do NOT build on CentOS 5, PCLinuxOS
+ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),)
$(call buildpkg,applications/kerberostray)
+endif
kerry: tdebase
$(call buildpkg,applications/kerry)
@@ -684,7 +699,10 @@ tdmtheme: tdebase
$(call buildpkg,applications/tdmtheme)
tellico: tdebase
+# Do NOT build on CentOS 5
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/tellico)
+endif
tork: tdebase torsocks
$(call buildpkg,applications/tork)
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index ca8303ae2..f5c4c637c 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
# Most TDE libraries have no prefix
#"libkdcraw") PREFIX="";;
# 3rd party dependencies
- "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";;
+ "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";;
# Extra build stuff
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
# Other
@@ -94,7 +94,7 @@ if [ -n "${DEVEL}" ]; then
"dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
"esound") PKGDEVEL="esound-devel";;
"imlib1") PKGDEVEL="${lib}Imlib-devel";;
- "pan") PKGDEVEL="uulib-devel";;
+ "koffice") PKGDEVEL="koffice-devel";;
"libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
"libcaldav") PKGDEVEL="${lib}caldav-devel";;
"libcarddav") PKGDEVEL="${lib}carddav-devel";;
@@ -102,6 +102,7 @@ if [ -n "${DEVEL}" ]; then
"libkexiv2") PKGDEVEL="${lib}kexiv2-devel";;
"libkipi") PKGDEVEL="${lib}kipi-devel";;
"libr") PKGDEVEL="${lib}r-devel";;
+ "pan") PKGDEVEL="uulib-devel";;
"tqca") PKGDEVEL="${lib}tqca-devel";;
"tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
"tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 72a142db9..fafb66e05 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -16,16 +16,16 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
if [ -x /usr/bin/dnf ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+ REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")'
elif [ -x /usr/sbin/urpmi ]; then
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 ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
if [ "$(rpm -E %dist)" = ".el5" ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+ REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
else
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+ REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
fi
elif [ -x /usr/bin/apt-get ]; then
REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 4b8e8e92b..7505ef930 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -83,7 +83,7 @@ do_optimizegraphics() {
done < submodules
}
-alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"'
+alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort'
# Update main repository
alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)'