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