From b6bc598e5c38271a104167f6235fb23faa962854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 29 Jul 2015 10:56:07 +0000
Subject: [PATCH] build fixes for rpm

---
 ax_init_standard_project.m4 |  1 -
 bootstrap.sh                | 24 +++++++++++-------------
 mrw-c++.spec.in             |  6 +++---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 76ee9f7..39242af 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -311,7 +311,6 @@ EOF
 
 # use this in configure.ac to support RPM packages
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
-#  m4_include(ax_rpm_rules.m4)
   AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in])
diff --git a/bootstrap.sh b/bootstrap.sh
index 387b093..4b79ec2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -724,7 +724,7 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: 1
+Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: $(if testtag AX_USE_LIBTOOL; then
   echo Development/Libraries/C++;
@@ -732,17 +732,16 @@ else
   echo Applications/...;
 fi)
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: pkg-config, subversion, autotools-devel, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-$(if testtag AX_USE_CPPUNIT; then
-cat <<EOF2
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-BuildRequires: cppunit-devel
+%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)
 %else%if 0%{?suse_version} || 0%{?sles_version}
-BuildRequires: libcppunit-devel
+BuildRequires: pkg-config, lsb-release$(if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-devel"; fi)
 %endif%endif
-EOF2
-fi)
+%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl}
+$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
+%endif
 
 %description
 @README@
@@ -769,9 +768,10 @@ rm -rf \$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/bin/*
 $(if testtag AX_USE_LIBTOOL; then
 echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
+else
+/usr/bin/
 fi)
 %doc
 /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
@@ -797,13 +797,11 @@ This Package contains all files required for developement.
 %defattr(-,root,root,-)
 /usr/%_lib/@PACKAGE_NAME@.so
 /usr/%_lib/@PACKAGE_NAME@.a
-/usr/%_lib/pkgconfig
 /usr/%_lib/@PACKAGE_NAME@.la
+/usr/%_lib/pkgconfig
 /usr/include/
-/usr/share/pkgconfig
 %doc
 /usr/share/doc/packages/@PACKAGE_NAME@/html
-/usr/share/doc/packages/@PACKAGE_NAME@/@PACKAGE_NAME@.spec
 EOF2
 fi)
 
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index ddf0404..1c270ab 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -12,12 +12,12 @@ BuildRequires: graphviz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
 BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
-%else%if 0%{?suse_version} || 0%{?sles_version}
-BuildRequires: pkg-config, libcppunit-devel, lsb-release
-%endif%endif
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 BuildRequires: mscgen
 %endif
+%else%if 0%{?suse_version} || 0%{?sles_version}
+BuildRequires: pkg-config, libcppunit-devel, lsb-release
+%endif%endif
 
 %description
 @README@