fixed version number

ChangeLog

@@ -1,3 +1,87 @@
+2015-07-30 14:13  marc
+
+	* ax_check_qt.m4: qt4 in centos
+
+2015-07-30 13:59  marc
+
+	* libpcscxx.spec.in: qt4 in centos and p11 in suse11
+
+2015-07-30 13:56  marc
+
+	* ax_check_qt.m4, bootstrap.sh, libpcscxx.spec.in: qt4 in centos
+	  and p11 in suse11
+
+2015-07-30 13:49  marc
+
+	* libpcscxx.spec.in: packages
+
+2015-07-30 13:32  marc
+
+	* libpcscxx.spec.in: packages for opensuse 11.4
+
+2015-07-30 13:27  marc
+
+	* libpcscxx.spec.in: packages for centos
+
+2015-07-30 13:12  marc
+
+	* libpcscxx.spec.in: packages for centos
+
+2015-07-30 12:55  marc
+
+	* libpcscxx.spec.in: package bin
+
+2015-07-30 12:40  marc
+
+	* ax_check_qt.m4: qt-tools are named tool-qt5 in suse :p
+
+2015-07-30 12:39  marc
+
+	* libpcscxx.spec.in: fedora packages ...
+
+2015-07-30 12:33  marc
+
+	* ax_check_qt.m4, bootstrap.sh: qt-tools are named tool-qt5 in suse
+	  :p
+
+2015-07-30 12:15  marc
+
+	* libpcscxx.spec.in: fixed qt dependencies
+
+2015-07-30 11:44  marc
+
+	* libpcscxx.spec.in: fixed qt dependencies
+
+2015-07-30 10:21  marc
+
+	* configure.ac, libpcscxx.spec.in: fixed rpm dependency
+
+2015-07-30 09:55  marc
+
+	* libpcscxx.spec.in: fixed rpm dependency
+
+2015-07-30 09:38  marc
+
+	* libpcscxx.spec.in: fixed qt detection
+
+2015-07-30 09:33  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  libpcscxx.spec.in: fixed qt detection
+
+2015-07-30 08:39  marc
+
+	* libpcscxx.spec.in: ready for rpm
+
+2015-07-30 08:26  marc
+
+	* makefile.am: ready for rpm
+
+2015-07-30 08:13  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  libpcscxx.spec.in: enable rpm build
+
 2015-07-27 08:35  marc
 
 	* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,

ax_init_standard_project.m4

@@ -22,21 +22,19 @@ m4_define(x_least, mrw_esyscmd_s([
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # 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"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
       break;
-    fi
+    fi;
   done
   # Mac does not support LEAST > 255
-  echo $ECHO_N $((x_minor+$SVN_REVISION/256))
+  echo $ECHO_N $(($SVN_REVISION/256))
 ]))
 # setup version number
-m4_define(x_version, mrw_esyscmd_s([
-  echo $ECHO_N x_major.x_minor_fixed.x_least
-]))
+m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least])
 
 ## bugreport mail address is taken from <user@host> in first line of AUTHORS
 m4_define(x_bugreport, mrw_esyscmd_s([
@@ -264,9 +262,9 @@ EOF
 # use this in configure.ac to support C++ libraries
 AC_DEFUN([AX_USE_LIBTOOL], [
   # 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_LEAST=x_minor_fixed
+  LIB_LEAST=m4_eval(x_minor+x_minor_diff)
   LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
   AM_LDFLAGS="-version-info ${LIB_VERSION}"
   AC_SUBST(AM_LDFLAGS)

bootstrap.sh

@@ -741,11 +741,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig, redhat-lsb$(
     if testtag AX_USE_CPPUNIT; then
       echo -n ", cppunit-devel";
-    fi;
-    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-      echo -n ", qt5-qtwebkit-devel";
     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_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
 %else

configure.ac

@@ -2,7 +2,7 @@
 
 m4_define(x_package_name, libpcscxx)
 m4_define(x_major, 3)
-m4_define(x_minor, 2)
+m4_define(x_minor, 3)
 m4_include(ax_init_standard_project.m4)
 AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
 AM_INIT_AUTOMAKE([1.9 tar-pax])