From 4ee59fdbd2e5c949c4ed36a4dcccbecf75cdc702 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 18 Apr 2015 16:33:42 +0200 Subject: [PATCH] Sync with current server files before releasing --- etc/autodist/scripts/update-specfile | 3 ++- etc/cron.daily/40-autodist-cleanold | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/autodist/scripts/update-specfile b/etc/autodist/scripts/update-specfile index 0676f1a..3a32980 100755 --- a/etc/autodist/scripts/update-specfile +++ b/etc/autodist/scripts/update-specfile @@ -58,7 +58,8 @@ sed -i "s|^Vendor:.*|Vendor: openmamba|; s|^PreReq:[[:space:]]*/sbin/install-info|Requires(post):%{__install_info}|; s|^PreReq:[[:space:]]*%{__install_info}|Requires(post):%{__install_info}|; s|^PreReq:[[:space:]]*|Requires(pre): |; - s|http://.*.dl\.sourceforge\.net/|http://downloads.sourceforge.net/|" $SPECFILE + s|http://.*.dl\.sourceforge\.net/|http://downloads.sourceforge.net/|; + s|ftp://ftp.kde.org/pub/kde/|http://download.kde.org/|" $SPECFILE #sed -i "s|^\(Source.*:[[:space:]]*ftp://ftp.kde.org/pub/kde/stable/.*.tar.\)bz2|\1xz|" $SPECFILE if [ $BUILDREQNUM -gt 0 ]; then diff --git a/etc/cron.daily/40-autodist-cleanold b/etc/cron.daily/40-autodist-cleanold index 04a8444..7bbff41 100755 --- a/etc/cron.daily/40-autodist-cleanold +++ b/etc/cron.daily/40-autodist-cleanold @@ -3,9 +3,10 @@ RPMS_CTIME_OLD="+14" BUILD_CTIME_OLD="+14" -SOURCES_CTIME_OLD="+60" -SRPMS_CTIME_OLD="+30" +SOURCES_CTIME_OLD="+14" +SRPMS_CTIME_OLD="+14" TMP_CTIME_OLD="+2" +LOG_CTIME_OLD="+7" function clean() { dir=$1 @@ -18,6 +19,7 @@ function clean() { [ -e $dir/RPM/BUILD/ ] && find $dir/RPM/BUILD/ -mindepth 1 -maxdepth 1 -ctime ${BUILD_CTIME_OLD} -exec rm -rf {} \; [ -e $dir/RPM/SOURCES/ ] && find $dir/RPM/SOURCES/ -mindepth 1 -maxdepth 1 -ctime ${SOURCES_CTIME_OLD} -a ! -name "*.patch" -exec rm -rf {} \; [ -e $dir/RPM/SRPMS/ ] && find $dir/RPM/SRPMS/ -mindepth 1 -maxdepth 1 -ctime ${SRPMS_CTIME_OLD} -exec rm -f {} \; + [ -e $dir/.autoport/$arch/ ] && find $dir/.autoport/$arch/ -mindepth 1 -maxdepth 1 -ctime ${LOG_CTIME_OLD} -name *.log -exec rm -f {} \; } for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do