fixed rpm installation

2018-07-20 11:14:57 +00:00
parent 09a059d7c1
commit 39b2103b89
7 changed files with 38 additions and 26 deletions
--- a/ax_check_qt.m4
+++ b/ax_check_qt.m4
@@ -119,10 +119,17 @@ AC_DEFUN([AX_CHECK_QT], [
    AC_DEFINE([HAVE_$1])
    QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
    qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core)
-    if test -d "${qt_host_bins}"; then
-      QT_PLUGIN_PATH=${qt_host_bins}/../plugins
-    else
-      QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
+    qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core)
+    if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
+      QT_PLUGIN_PATH="${qt_libdir}/plugins"
+    elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
+      QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
+    elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
+      QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
+    elif test -d "${QTDIR}/plugins; then
+      QT_PLUGIN_PATH="${QTDIR}/plugins"
+    elif test -d "${QTDIR}/share/qt5/plugins; then
+      QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
    fi
    MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
    [$1]_CPPFLAGS="${[$1]5_CFLAGS}"
@@ -166,10 +173,17 @@ AC_DEFUN([AX_CHECK_QT], [
      AC_DEFINE([HAVE_$1])
      QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
      qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore)
-      if test -d "${qt_host_bins}"; then
-        QT_PLUGIN_PATH=${qt_host_bins}/../plugins
-      else
-        QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
+      qt_libdir=$(${PKG_CONFIG} --variable=libdir QtCore)
+      if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
+        QT_PLUGIN_PATH="${qt_libdir}/plugins"
+      elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
+        QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
+      elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
+        QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
+      elif test -d "${QTDIR}/plugins; then
+        QT_PLUGIN_PATH="${QTDIR}/plugins"
+      elif test -d "${QTDIR}/share/qt5/plugins; then
+        QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
      fi
      MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
      [$1]_CPPFLAGS="${[$1]_CFLAGS}"
@@ -214,9 +228,6 @@ AC_DEFUN([AX_CHECK_QT], [
    AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
  fi
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
-  if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then
-    QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr}
-  fi
  AC_ARG_WITH([qt-plugin-path],
              [AS_HELP_STRING([--with-qt-plugin-path=PATH],
                              [define a different qt plugin path, current @<:@default=check@:>@])],
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -218,7 +218,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_SUBST(AUTHOR_URL)
  AX_SUBST(AUTHOR_MAIL)
  AX_SUBST(PACKAGER)
-  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
+  #PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
  AX_SUBST(PROJECT_URL)
  AX_SUBST(SOURCE_DOWNLOAD)
@@ -365,12 +365,13 @@ AC_DEFUN([AX_USE_CXX], [
 #### Begin: Appended by $0
 %.app: %
 	-rm -r [\$][@]
-	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/tmp install
 	QTDIR="\${QTDIR}" \
 	QT_PLUGINS="\${QT_PLUGINS}" \
 	QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
 	  \${top_builddir}/mac-create-app-bundle.sh \
-	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+	    [\$][@] [\$][<] [\$][\$](pwd)/tmp[\$]{prefix}
+	-rm -rf tmp

 maintainer-clean-cxx-targets:
 	-rm makefile.in
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1773,7 +1773,7 @@ $(if testtag AX_USE_ETC; then

 cat <<EOF2
 %config
-/etc/*
+/etc

 EOF2
 fi)
@@ -1882,6 +1882,7 @@ $(if test -e README.md -a ! -e README; then
 cat <<EOF2

 README: README.md
+	cp README.md README

 CLEANFILES = README
 EOF2
--- a/debian/libpcscxx.install
+++ b/debian/libpcscxx.install
@@ -1,2 +1 @@
 usr/lib/lib*.so.*
-
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Fri, 03 February 2017 08:50:17 +0100
+##  -  on Wed, 18 July 2018 16:20:45 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
--- a/libpcscxx.spec.in
+++ b/libpcscxx.spec.in
@@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 /usr/%_lib/*.so.*
-/usr/bin
+/usr/bin/*

 %doc
 /usr/share/doc
--- a/mac-create-app-bundle.sh
+++ b/mac-create-app-bundle.sh
@@ -17,14 +17,12 @@ if test "$(uname -s)" != "Darwin"; then
    exit 1
 fi

-cd ${0%/*}
-
 project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)}
 apptarget=${1:-${project}.app}
-sources=${3:-$(pwd)/usr}
+sources=${3:-$(pwd)/tmp}
+! test -e "$apptarget" || rm -rf "$apptarget"
 test -n "$project"
 test -d "$sources"
-! test -e "$apptarget" || rm -rf "$apptarget"
 target="$(pwd)/${apptarget}/Contents/MacOS"

 echo "Creating $apptarget for $project from $sources"
@@ -33,6 +31,8 @@ echo "Creating $apptarget for $project from $sources"
 mkdir -p ${apptarget}/Contents/{Resources,MacOS}
 ! test -d ${sources}/bin || \
    find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
+! test -d ${sources}/scripts || \
+    find ${sources}/scripts -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
 executablefile=${apptarget}/Contents/MacOS/${project}
 test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1)
 ! test -d ${sources}/lib || \
@@ -40,9 +40,9 @@ test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ |
 ! test -d ${sources}/share/${project} || \
    find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
 ! test -d ${sources}/share || \
-    find ${sources}/share -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
+    find ${sources}/share -mindepth 1 -maxdepth 1 -name ${project} -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;
 ! test -d ${sources} || \
-    find ${sources} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
+    find ${sources} -mindepth 1 -maxdepth 1 -name share -o -name bin -o -name lib -o -name scripts -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;

 # Step 2: copy qt plugins, if necessary
 for f in ${QT_PLUGINS}; do
@@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do
    cd "${target}"
    for file in $(find . -type f); do
        for lib in $(otool -L ${file} | tail -n +2 \
-            | egrep '/opt/local/|'"${HOME}" \
+            | egrep '/usr/local/|/opt/local/|'"${HOME}" \
            | grep -v $file | awk '{print $1}'); do
            found=1
            test -f ${lib##*/} \