rpm builds improved and fixed
This commit is contained in:
24
bootstrap.sh
24
bootstrap.sh
@@ -1603,7 +1603,7 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
|
||||
Summary: @DESCRIPTION@
|
||||
Name: @PACKAGE_NAME@
|
||||
Version: @VERSION@
|
||||
Release: @BUILD_NUMBER@%{?dist}
|
||||
Release: @BUILD_NUMBER@.@DISTRO@
|
||||
License: LGPL
|
||||
Group: $(if testtag AX_USE_LIBTOOL; then
|
||||
echo Development/Libraries/C++;
|
||||
@@ -1617,9 +1617,6 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
|
||||
if testtag AX_USE_CXX; then
|
||||
echo -n ", binutils-devel, gcc-c++"
|
||||
fi
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libtool, libtool-ltdl-devel"
|
||||
fi
|
||||
if testtag AX_USE_CPPUNIT; then
|
||||
echo -n ", cppunit-devel"
|
||||
fi
|
||||
@@ -1638,14 +1635,27 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
|
||||
%if 0%{?suse_version} || 0%{?sles_version}
|
||||
BuildRequires: lsb-release
|
||||
%else
|
||||
%if 0%{?mageia}
|
||||
BuildRequires: rpm-sign, lsb-release
|
||||
%else
|
||||
BuildRequires: rpm-sign, redhat-lsb
|
||||
%endif$(
|
||||
%endif
|
||||
%endif
|
||||
$(
|
||||
if testtag AX_USE_DOXYGEN; then cat <<EOS
|
||||
%if ! 0%{?centos}
|
||||
BuildRequires: mscgen
|
||||
%fi
|
||||
%endif
|
||||
EOS
|
||||
fi)
|
||||
fi
|
||||
if testtag AX_USE_LIBTOOL; then cat <<EOS
|
||||
%if 0%{?mageia}
|
||||
BuildRequires: libtool, libltdl-devel
|
||||
%else
|
||||
BuildRequires: libtool, libtool-ltdl-devel
|
||||
%endif
|
||||
EOS
|
||||
fi)
|
||||
|
||||
%description
|
||||
@README@
|
||||
|
Reference in New Issue
Block a user