From d31c50870d0bee042ce660e445c9294a59a3a65b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 30 Jun 2016 20:26:57 +0000 Subject: Slackware 14.2 Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. 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. Have fun! :-) --- source/l/libmtp/libmtp.SlackBuild | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'source/l/libmtp/libmtp.SlackBuild') diff --git a/source/l/libmtp/libmtp.SlackBuild b/source/l/libmtp/libmtp.SlackBuild index 4783b6765..6bf90b462 100755 --- a/source/l/libmtp/libmtp.SlackBuild +++ b/source/l/libmtp/libmtp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -43,8 +43,8 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -77,6 +77,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAM}-$VERSION \ + --with-udev=/lib/udev \ --disable-static \ --build=$ARCH-slackware-linux @@ -84,14 +85,6 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Commented out, since the rules are added by the Makefile, and since -# there's no longer any match for MODE= -# -## Add udev rules: -#mkdir -p $PKG/lib/udev/rules.d -#sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \ -# > $PKG/lib/udev/rules.d/90-libmtp.rules - # Guess someone didn't have enough to drink: ( cd $PKG/usr/bin rm -f mtp-sendtr mtp-sendfile mtp-newfolder mtp-getfile mtp-delfile @@ -133,6 +126,8 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL README* TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +rm -rf $PKG/usr/share/doc +rmdir $PKG/usr/share 2> /dev/null # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: -- cgit v1.2.3-65-gdbad