fixed version number
This commit is contained in:
@@ -1,16 +1,16 @@
|
|||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
#
|
#
|
||||||
# Check if a module exists:
|
# Check if a module exists:
|
||||||
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||||
#
|
#
|
||||||
# Abort if a module does not exist:
|
# Abort if a module does not exist:
|
||||||
# AX_CXX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
# AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||||
#
|
#
|
||||||
# DESCRIPTIONS
|
# DESCRIPTIONS
|
||||||
#
|
#
|
||||||
# qt_prefix
|
# qt_prefix
|
||||||
#
|
#
|
||||||
# Each call to AX_CXX_CHECK_QT should have a different prefix
|
# Each call to AX_CHECK_QT should have a different prefix
|
||||||
# value (with a few exceptions discussed later on). This value,
|
# value (with a few exceptions discussed later on). This value,
|
||||||
# usually provided in uppercase, is used as prefix to the
|
# usually provided in uppercase, is used as prefix to the
|
||||||
# variables holding the compiler flags and libraries reported by
|
# variables holding the compiler flags and libraries reported by
|
||||||
@@ -43,12 +43,18 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
|
|||||||
AC_MSG_CHECKING([for $2])
|
AC_MSG_CHECKING([for $2])
|
||||||
AC_ARG_VAR([$1], [path to Qt tool $2])
|
AC_ARG_VAR([$1], [path to Qt tool $2])
|
||||||
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
|
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
|
||||||
|
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5}
|
||||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
|
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
|
||||||
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
|
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
|
||||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
|
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
|
||||||
|
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4}
|
||||||
if ! which "${$1%% *}" > /dev/null; then
|
if ! which "${$1%% *}" > /dev/null; then
|
||||||
if which "$2" > /dev/null; then
|
if which "$2-qt5" > /dev/null; then
|
||||||
|
$1=$2-qt5
|
||||||
|
elif which "$2" > /dev/null; then
|
||||||
$1=$2
|
$1=$2
|
||||||
|
elif which "$2-qt4" > /dev/null; then
|
||||||
|
$1=$2-qt4
|
||||||
else
|
else
|
||||||
HAVE_$1=0
|
HAVE_$1=0
|
||||||
$1=""
|
$1=""
|
||||||
@@ -179,13 +185,13 @@ qrc_%.cxx: %.qrc
|
|||||||
|
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
#
|
#
|
||||||
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||||
#
|
#
|
||||||
# DESCRIPTIONS
|
# DESCRIPTIONS
|
||||||
#
|
#
|
||||||
# qt_prefix
|
# qt_prefix
|
||||||
#
|
#
|
||||||
# Each call to AX_CXX_CHECK_QT should have a different prefix
|
# Each call to AX_CHECK_QT should have a different prefix
|
||||||
# value (with a few exceptions discussed later on). This value,
|
# value (with a few exceptions discussed later on). This value,
|
||||||
# usually provided in uppercase, is used as prefix to the
|
# usually provided in uppercase, is used as prefix to the
|
||||||
# variables holding the compiler flags and libraries reported by
|
# variables holding the compiler flags and libraries reported by
|
||||||
|
@@ -22,21 +22,19 @@ m4_define(x_least, mrw_esyscmd_s([
|
|||||||
# define version number from subversion's revision number:
|
# define version number from subversion's revision number:
|
||||||
# it is taken modulo 256 due to a bug on Apple's MacOSX
|
# it is taken modulo 256 due to a bug on Apple's MacOSX
|
||||||
# add to x_minor if revision number is > 256
|
# add to x_minor if revision number is > 256
|
||||||
m4_define(x_minor_fixed, mrw_esyscmd_s([
|
m4_define(x_minor_diff, mrw_esyscmd_s([
|
||||||
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
|
||||||
for path in . .. ../..; do
|
for path in . .. ../..; do
|
||||||
if svn info $path 2>&1 > /dev/null; then
|
if svn info $path 2>&1 > /dev/null; then
|
||||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||||
break;
|
break;
|
||||||
fi
|
fi;
|
||||||
done
|
done
|
||||||
# Mac does not support LEAST > 255
|
# Mac does not support LEAST > 255
|
||||||
echo $ECHO_N $((x_minor+$SVN_REVISION/256))
|
echo $ECHO_N $(($SVN_REVISION/256))
|
||||||
]))
|
]))
|
||||||
# setup version number
|
# setup version number
|
||||||
m4_define(x_version, mrw_esyscmd_s([
|
m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least])
|
||||||
echo $ECHO_N x_major.x_minor_fixed.x_least
|
|
||||||
]))
|
|
||||||
|
|
||||||
## bugreport mail address is taken from <user@host> in first line of AUTHORS
|
## bugreport mail address is taken from <user@host> in first line of AUTHORS
|
||||||
m4_define(x_bugreport, mrw_esyscmd_s([
|
m4_define(x_bugreport, mrw_esyscmd_s([
|
||||||
@@ -85,7 +83,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
|
|||||||
# $1 = variable name
|
# $1 = variable name
|
||||||
AC_DEFUN([AX_SUBST], [
|
AC_DEFUN([AX_SUBST], [
|
||||||
AC_SUBST([$1])
|
AC_SUBST([$1])
|
||||||
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n')
|
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
|
||||||
tmp_var=${tmp_var//\"/\\\"}
|
tmp_var=${tmp_var//\"/\\\"}
|
||||||
tmp_var=${tmp_var//\'/\'\"\'\"\'}
|
tmp_var=${tmp_var//\'/\'\"\'\"\'}
|
||||||
tmp_var=${tmp_var//#/\\#}
|
tmp_var=${tmp_var//#/\\#}
|
||||||
@@ -264,9 +262,9 @@ EOF
|
|||||||
# use this in configure.ac to support C++ libraries
|
# use this in configure.ac to support C++ libraries
|
||||||
AC_DEFUN([AX_USE_LIBTOOL], [
|
AC_DEFUN([AX_USE_LIBTOOL], [
|
||||||
# libtool versioning
|
# libtool versioning
|
||||||
LIB_MAJOR=m4_eval(x_major+x_minor_fixed)
|
LIB_MAJOR=m4_eval(x_major+x_minor+x_minor_diff)
|
||||||
LIB_MINOR=x_least
|
LIB_MINOR=x_least
|
||||||
LIB_LEAST=x_minor_fixed
|
LIB_LEAST=m4_eval(x_minor+x_minor_diff)
|
||||||
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
|
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
|
||||||
AM_LDFLAGS="-version-info ${LIB_VERSION}"
|
AM_LDFLAGS="-version-info ${LIB_VERSION}"
|
||||||
AC_SUBST(AM_LDFLAGS)
|
AC_SUBST(AM_LDFLAGS)
|
||||||
|
35
bootstrap.sh
35
bootstrap.sh
@@ -732,16 +732,33 @@ else
|
|||||||
echo Applications/...;
|
echo Applications/...;
|
||||||
fi)
|
fi)
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
BuildRequires: gnupg, subversion, automake, autoconf $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
|
BuildRequires: gnupg, subversion, automake, autoconf$(
|
||||||
|
if testtag AX_USE_DOXYGEN; then
|
||||||
|
echo -n ", doxygen, graphviz";
|
||||||
|
fi)
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||||
BuildRequires: pkgconfig, redhat-lsb$(if testtag AX_USE_CPPUNIT; then echo -n ", cppunit-devel"; fi)
|
BuildRequires: pkgconfig, redhat-lsb$(
|
||||||
%else%if 0%{?suse_version} || 0%{?sles_version}
|
if testtag AX_USE_CPPUNIT; then
|
||||||
BuildRequires: pkg-config, lsb-release$(if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-devel"; fi)
|
echo -n ", cppunit-devel";
|
||||||
%endif%endif
|
fi)
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl}
|
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||||
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
|
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
|
||||||
|
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
|
||||||
|
%else
|
||||||
|
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt-devel"; fi)
|
||||||
%endif
|
%endif
|
||||||
|
%else%if 0%{?suse_version} || 0%{?sles_version}
|
||||||
|
BuildRequires: pkg-config, lsb-release$(
|
||||||
|
if testtag AX_USE_CPPUNIT; then
|
||||||
|
echo -n ", libcppunit-devel";
|
||||||
|
fi)
|
||||||
|
%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200
|
||||||
|
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
|
||||||
|
%else
|
||||||
|
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
|
||||||
|
%endif
|
||||||
|
%endif%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@README@
|
@README@
|
||||||
@@ -753,8 +770,8 @@ fi)
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \\
|
||||||
--docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \
|
--docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \\
|
||||||
--libdir=/usr/%_lib
|
--libdir=/usr/%_lib
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@@ -784,7 +801,7 @@ fi)
|
|||||||
$(if testtag AX_USE_LIBTOOL; then
|
$(if testtag AX_USE_LIBTOOL; then
|
||||||
cat <<EOF2
|
cat <<EOF2
|
||||||
%package devel
|
%package devel
|
||||||
Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files)
|
Summary: @DESCRIPTION@
|
||||||
Group: Development/Libraries/C++
|
Group: Development/Libraries/C++
|
||||||
Requires: @PACKAGE_NAME@ = @VERSION@
|
Requires: @PACKAGE_NAME@ = @VERSION@
|
||||||
|
|
||||||
|
@@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files)
|
Summary: @DESCRIPTION@
|
||||||
Group: Development/Libraries/C++
|
Group: Development/Libraries/C++
|
||||||
Requires: @PACKAGE_NAME@ = @VERSION@
|
Requires: @PACKAGE_NAME@ = @VERSION@
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user