diff --git a/autodist-upstream-updates b/autodist-upstream-updates
index 3242c59..a471939 100755
--- a/autodist-upstream-updates
+++ b/autodist-upstream-updates
@@ -175,7 +175,7 @@ parse_arch_linux() {
#for page in `seq 1 45`; do
for rep in core community extra; do
# SOURCEURL="https://www.archlinux.org/packages/?page=$page&sort=-last_update&q=&arch=i686&maintainer=&flagged="
- SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/i686/"
+ SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/x86_64/"
curl -L -s "$SOURCEURL" | \
grep ".pkg." | grep -v ".sig\"" | \
while read line; do
@@ -259,7 +259,7 @@ parse_gnome() {
parse_distromatic() {
# parse distrowatch.com packages list
[ "$quiet" ] || echo "Parsing Distrowatch packages list..." >&2
- SOURCEURL="http://distrowatch.gds.tuwien.ac.at/packages.php"
+ SOURCEURL="https://distrowatch.com/packages.php"
lynx -width 300 -dump $SOURCEURL |
while read line; do
[ "`echo $line | grep "Package Version Note"`" ] && start_print=1
diff --git a/automaint b/automaint
index c73a825..9321a19 100755
--- a/automaint
+++ b/automaint
@@ -173,13 +173,18 @@ rm -f $tmpfile
for p in ${allpkgs}; do
pkgcontinue=
needsport=
+
for w in ${warningslist[*]}; do
[ "$p" = "$w" ] && { pkgcontinue=1; break; }
done
[ "$pkgcontinue" ] && continue
for a in `seq 1 ${#ARCHS[*]}`; do
- get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
+ get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$PORT_REPOSITORY ${ARCHS[$a-1]} $p
+ if [ ! "$pkg_name" ]; then
+ get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
+ fi
+
if [ "$pkg_name" ]; then
spkg_version=$pkg_version
spkg_release=$pkg_release
@@ -253,7 +258,7 @@ for p in ${allpkgs}; do
continue
fi
fi
- if [ "$needsport" ]; then
+ if [ "$needsport" -o "$pkg_repository" == "$PORT_REPOSITORY" ]; then
echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release)"
if [ ! "$TESTMODE" ]; then
autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null
@@ -262,7 +267,7 @@ for p in ${allpkgs}; do
MESSAGE=`cgi_encodevar \"imported $p from $SOURCE_REPOSITORY to $PORT_REPOSITORY for porting\"`" >/dev/null
fi
fi
- else
+ elif [ "$pkg_repository" == "$DEST_REPOSITORY" ]; then
echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release; update type: $update_type)"
if [ ! "$TESTMODE" ]; then
autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null
@@ -271,6 +276,8 @@ MESSAGE=`cgi_encodevar \"imported $p from $SOURCE_REPOSITORY to $p from $SOURCE_REPOSITORY to $DEST_REPOSITORY\"`" >/dev/null
fi
fi
+ else
+ echo "$p: unexpected upstream package repository; ignoring."
fi
done
diff --git a/etc/autodist/blacklist b/etc/autodist/blacklist
index 6452a7b..80df184 100644
--- a/etc/autodist/blacklist
+++ b/etc/autodist/blacklist
@@ -12,7 +12,6 @@ makedist
makedist-openmamba
postplug
grub-theme-openmamba
-kdevelop
lxde
distromatic
u-boot
diff --git a/etc/autodist/scripts/update-specfile b/etc/autodist/scripts/update-specfile
index 2d0f760..027f848 100755
--- a/etc/autodist/scripts/update-specfile
+++ b/etc/autodist/scripts/update-specfile
@@ -52,6 +52,8 @@ done
sed -i "s|^Vendor:.*|Vendor: openmamba|;
s|^Distribution:.*|Distribution: openmamba|;
/BuildRequires:[[:space:]]*libffmpeg-devel/d;
+ /^BuildRequires:[[:space:]]*libkdegames-devel/d;
+ /^BuildRequires:[[:space:]]*libkdegames5-devel/d;
s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|;
s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-devel|;
s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|;