Allow RPMs and SRPMs to be generated with v7/v8b emulation; Add CMake scripts and other missing files to source distribution

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@276 3789f03b-4d11-0410-bbf8-ca57d06f2519

3 files changed, 6 insertions, 99 deletions

diff --git a/trunk/release/libjpeg-turbo.spec b/trunk/release/libjpeg-turbo.spec.in
index 0ff7211..bbf2879 100644
--- a/trunk/release/libjpeg-turbo.spec
+++ b/trunk/release/libjpeg-turbo.spec.in
@@ -5,13 +5,13 @@
 %endif
 
 Summary: A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs
-Name: %{_name}
-Version: %{_version}
+Name: @PACKAGE_NAME@
+Version: @VERSION@
 Vendor: The libjpeg-turbo Project
 URL: http://libjpeg-turbo.virtualgl.org
 Group: System Environment/Libraries
 #-->Source0: http://prdownloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
-Release: %{_build}
+Release: @BUILD@
 License: wxWindows Library License, v3.1
 BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release}
 Prereq: /sbin/ldconfig
@@ -39,7 +39,7 @@ TurboJPEG/IPP.  It is faster in some areas but slower in others.
 #-->%setup -q
 
 #-->%build
-#-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man --with-pic
+#-->configure libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man JPEG_LIB_VERSION=@JPEG_LIB_VERSION@ SO_MAJOR_VERSION=@SO_MAJOR_VERSION@ SO_MINOR_VERSION=@SO_MINOR_VERSION@ --with-pic
 #-->make DESTDIR=$RPM_BUILD_ROOT libdir=/opt/%{name}/%{__lib} mandir=/opt/%{name}/man
 
 %install
@@ -82,8 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 %else
 /opt/%{name}/lib32
 %endif
-/opt/%{name}/%{__lib}/libjpeg.so.62.0.0
-/opt/%{name}/%{__lib}/libjpeg.so.62
+/opt/%{name}/%{__lib}/libjpeg.so.@SO_MAJOR_VERSION@.0.@SO_MINOR_VERSION@
+/opt/%{name}/%{__lib}/libjpeg.so.@SO_MAJOR_VERSION@
 /opt/%{name}/%{__lib}/libjpeg.so
 /opt/%{name}/%{__lib}/libjpeg.a
 /opt/%{name}/%{__lib}/libturbojpeg.a
diff --git a/trunk/release/makerpm b/trunk/release/makerpm
deleted file mode 100644
index 8aee3a0..0000000
--- a/trunk/release/makerpm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-TMPDIR=
-
-onexit()
-{
-	if [ ! "$TMPDIR" = "" ]; then
-		rm -rf $TMPDIR
-	fi
-}
-
-usage()
-{
-	echo "$0 <package name> <version> <build> <RPM architecture> <source dir.>"
-	exit 1
-}
-
-if [ $# -lt 5 ]; then usage $0; fi
-PACKAGE_NAME=$1
-VERSION=$2
-BUILD=$3
-RPMARCH=$4
-SRCDIR=$5
-
-TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
-mkdir -p $TMPDIR/RPMS
-ln -fs `pwd` $TMPDIR/BUILD
-rm -f $PACKAGE_NAME.$RPMARCH.rpm
-rpmbuild -bb --define "_name $PACKAGE_NAME" \
-	--define "_blddir $TMPDIR/buildroot" --define "_topdir $TMPDIR" \
-	--define "_version $VERSION" --define "_build $BUILD" \
-	--define "_srcdir $SRCDIR" --target $RPMARCH \
-	$SRCDIR/release/libjpeg-turbo.spec
-cp $TMPDIR/RPMS/$RPMARCH/$PACKAGE_NAME-$VERSION-$BUILD.$RPMARCH.rpm $PACKAGE_NAME.$RPMARCH.rpm
-
-exit
diff --git a/trunk/release/makesrpm b/trunk/release/makesrpm
deleted file mode 100644
index bb31832..0000000
--- a/trunk/release/makesrpm
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-TMPDIR=
-
-onexit()
-{
-	if [ ! "$TMPDIR" = "" ]; then
-		rm -rf $TMPDIR
-	fi
-}
-
-usage()
-{
-	echo "$0 <package name> <version> <build> <RPM architecture> <source dir.>"
-	exit 1
-}
-
-if [ $# -lt 4 ]; then usage $0; fi
-PACKAGE_NAME=$1
-VERSION=$2
-BUILD=$3
-SRCDIR=$4
-
-TARBALL=$PACKAGE_NAME-$VERSION.tar.gz
-if [ ! -f ./$TARBALL ]; then
-	echo ./$TARBALL does not exist.  Run make dist-gzip first.
-	exit -1
-fi
-
-TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
-mkdir -p $TMPDIR/RPMS
-mkdir -p $TMPDIR/SRPMS
-mkdir -p $TMPDIR/BUILD
-mkdir -p $TMPDIR/SOURCES
-mkdir -p $TMPDIR/SPECS
-rm -f $PACKAGE_NAME.src.rpm
-cp $TARBALL $TMPDIR/SOURCES
-cat $SRCDIR/release/libjpeg-turbo.spec | sed s/%{_name}/$PACKAGE_NAME/g \
-	| sed s/%{_version}/$VERSION/g | sed s/%{_build}/$BUILD/g \
-	| sed s/%{_blddir}/%{_tmppath}/g | sed s@%{_srcdir}/@@g \
-	| sed s/#--\>//g >$TMPDIR/SPECS/libjpeg-turbo.spec
-rpmbuild -bs --define "_topdir $TMPDIR" $TMPDIR/SPECS/libjpeg-turbo.spec
-cp $TMPDIR/SRPMS/$PACKAGE_NAME-$VERSION-$BUILD.src.rpm $PACKAGE_NAME.src.rpm
-
-exit