summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xkde/KDE.SlackBuild6
-rw-r--r--kde/KDE.options2
-rwxr-xr-xkdei/kde-l10n/kde-l10n.SlackBuild2
3 files changed, 5 insertions, 5 deletions
diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild
index e342333..4dd6666 100755
--- a/kde/KDE.SlackBuild
+++ b/kde/KDE.SlackBuild
@@ -148,7 +148,7 @@ precheck() {
# See if the sources we have match the module components we want to build:
RETVAL=0
- for SRCFILE in $(find $CWD/src -name "*.tar.?z*") ; do
+ for SRCFILE in $(find $CWD/src -name "*.tar.?z*" |grep -vE ".asc$|.sig$") ; do
# Check if the source tarball is mentioned in pkgsrc/
# meaning its package will get a different name:
PKGSRC=$(echo $SRCFILE |rev |cut -f2- -d- |cut -f1,2 -d/ |rev)
@@ -194,7 +194,7 @@ precheck() {
MODBASE=$MODULE
MODLOC=""
fi
- MODSRC="$(find $CWD/src/$MODLOC -name $MODBASE-*.tar.* |grep -E "$MODBASE-[^-]+.tar.*$|$MODBASE-[0-9].+.tar.*$")"
+ MODSRC="$(find $CWD/src/$MODLOC -name $MODBASE-*.tar.* |grep -vE ".asc$|.sig$" |grep -E "$MODBASE-[^-]+.tar.*$|$MODBASE-[0-9].+.tar.*$")"
if [ -z "$MODSRC" ] ; then
echo "Module '$MODULE' does not have a matching source tarball ($MODLOC$MODBASE)!"
if [ "$CHECKOUT" = "yes" -o "$CHECKOUT" = "YES" ]; then
@@ -257,7 +257,7 @@ build_mod_pkg () {
PKGSRC=$PKGNAME
PKGLOC=""
fi
- kde_src=$(basename $(find $CWD/src/$PKGLOC -name "$PKGSRC-*.tar.?z*" |grep -E "$PKGSRC-[^-]+.tar.*$|$PKGSRC-[0-9].+.tar.*$") 2>/dev/null)
+ kde_src=$(basename $(find $CWD/src/$PKGLOC -name "$PKGSRC-*.tar.?z*" |grep -vE ".asc$|.sig$" |grep -E "$PKGSRC-[^-]+.tar.*$|$PKGSRC-[0-9].+.tar.*$") 2>/dev/null)
if [ "x$kde_src" = "x" ]; then
echo "** Did not find '$PKGSRC' in src"
continue
diff --git a/kde/KDE.options b/kde/KDE.options
index 63c325a..6a1a769 100644
--- a/kde/KDE.options
+++ b/kde/KDE.options
@@ -3,7 +3,7 @@
# usually has a different version number), or by setting your own
# environment variables.
-[ -z $VERSION ] && export VERSION=5.6.4
+[ -z $VERSION ] && export VERSION=5.6.5
[ -z $BUILD ] && export BUILD=1
# Automatically determine the architecture we're building on:
diff --git a/kdei/kde-l10n/kde-l10n.SlackBuild b/kdei/kde-l10n/kde-l10n.SlackBuild
index e41fceb..e3fd395 100755
--- a/kdei/kde-l10n/kde-l10n.SlackBuild
+++ b/kdei/kde-l10n/kde-l10n.SlackBuild
@@ -35,7 +35,7 @@ if [ ! -r ./languages ]; then
done
fi
-[ -z $VERSION ] && export VERSION=16.04.1
+[ -z $VERSION ] && export VERSION=16.04.2
[ -z $ARCH ] && export ARCH=noarch
[ -z $BUILD ] && export BUILD=1