Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

3 files changed, 23 insertions, 20 deletions

diff --git a/source/l/ebook-tools/ebook-tools.SlackBuild b/source/l/ebook-tools/ebook-tools.SlackBuild
index 690d71def..162693f9e 100755
--- a/source/l/ebook-tools/ebook-tools.SlackBuild
+++ b/source/l/ebook-tools/ebook-tools.SlackBuild
@@ -23,24 +23,20 @@
 
 
 PKGNAM=ebook-tools
-VERSION=${VERSION:-0.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -53,11 +49,20 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
diff --git a/source/l/ebook-tools/ebook-tools.paths.diff b/source/l/ebook-tools/ebook-tools.paths.diff
index 3752b1069..7f857b036 100644
--- a/source/l/ebook-tools/ebook-tools.paths.diff
+++ b/source/l/ebook-tools/ebook-tools.paths.diff
@@ -1,12 +1,10 @@
-diff -ur ebook-tools-0.1.1/src/libepub/CMakeLists.txt ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt
---- ebook-tools-0.1.1/src/libepub/CMakeLists.txt	2008-06-07 20:20:14.000000000 +0100
-+++ ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt	2008-12-15 02:59:58.621077025 +0000
+--- ebook-tools-0.2.1/src/libepub/CMakeLists.txt.orig	2010-09-13 21:31:53.000000000 +0200
++++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt	2010-12-09 14:11:39.751653250 +0100
 @@ -4,5 +4,5 @@
  
- set_target_properties (epub PROPERTIES VERSION 0.1.1 SOVERSION 0)
+ set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
  
 -install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
--install ( FILES epub.h epub_shared.h DESTINATION include )
+-install ( FILES epub.h epub_shared.h epub_version.h DESTINATION include )
 +install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
-+install ( FILES epub.h epub_shared.h DESTINATION ${INCLUDE_INSTALL_DIR} )
-
++install ( FILES epub.h epub_shared.h epub_version.h DESTINATION ${INCLUDE_INSTALL_DIR} )
diff --git a/source/l/ebook-tools/slack-desc b/source/l/ebook-tools/slack-desc
index abb2ef883..374d507b4 100644
--- a/source/l/ebook-tools/slack-desc
+++ b/source/l/ebook-tools/slack-desc
@@ -10,10 +10,10 @@ ebook-tools: ebook-tools (access and convert various ebook file formats)
 ebook-tools:
 ebook-tools: Tools for accessing and converting various ebook file formats. 
 ebook-tools:
+ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/
 ebook-tools:
 ebook-tools:
 ebook-tools:
 ebook-tools:
 ebook-tools:
-ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/
 ebook-tools: