3 files changed, 4 insertions, 32 deletions
diff --git a/source/l/python-sphinx/python-sphinx.SlackBuild b/source/l/python-sphinx/python-sphinx.SlackBuild
index 81a31b455..924ad44c9 100755
--- a/source/l/python-sphinx/python-sphinx.SlackBuild
+++ b/source/l/python-sphinx/python-sphinx.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=python-sphinx
 SRCNAM=sphinx
 VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xap/geeqie/fix-build-re-docs.diff b/source/xap/geeqie/fix-build-re-docs.diff
deleted file mode 100644
index 279d8566e..000000000
--- a/source/xap/geeqie/fix-build-re-docs.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur geeqie-1.4.orig/Makefile.am geeqie-1.4/Makefile.am
---- geeqie-1.4.orig/Makefile.am	2017-12-31 06:31:21.000000000 -0600
-+++ geeqie-1.4/Makefile.am	2018-01-02 02:18:15.881141642 -0600
-@@ -9,11 +9,7 @@
- 
- readmedir = @readmedir@
- 
--if HAVE_MARKDOWN
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
--else
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
--endif
-+readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS
- 
- desktopdir = $(datadir)/applications
- desktop_in_files = geeqie.desktop.in
-@@ -37,9 +33,3 @@
- 
- DISTCLEANFILES = config.report
- 
--.PHONY: ChangeLog
--ChangeLog.html:
--	./gen_changelog.sh
--
--README.html: README.md
--	./gen_readme.sh
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index 284650359..bd624a359 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -41,7 +41,7 @@ VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -61,9 +61,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -march=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -march=pentium4 -mtune=generic"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64 -fPIC"
 else
@@ -115,7 +113,7 @@ cd ..
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS* CHECKLIST* CODING* COPYING* NEWS* README* TODO* \
+  CHECKLIST* CODE_OF_CONDUCT* CODING* COPYING* ChangeLog DEVELOPER-NOTES* NEWS* README* TESTING* TODO* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history