diff --git a/INSTALL b/INSTALL index f812f5a..ddcdb76 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.14/INSTALL \ No newline at end of file +/usr/share/automake-1.15/INSTALL \ No newline at end of file diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 8235bf6..d163010 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -225,6 +225,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_') AX_SUBST(VENDOR) DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) + if test "${DISTRO}" = "n/a"; then + DISTRO="${VENDOR}_$(lsb_release -sr 2>/dev/null | tr ' ' '_')" + fi AX_SUBST(DISTRO) ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm)) AX_SUBST(ARCH) @@ -594,7 +597,7 @@ AC_DEFUN([AX_USE_DOXYGEN], [ AC_CHECK_PROG(have_doxygen, doxygen, yes, no) AC_CHECK_PROG(have_dot, dot, yes, no) AC_CHECK_PROG(have_mscgen, mscgen, yes, no) - AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v) | sort -V | head -1)) + AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1)) PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf AC_SUBST(PDF_DOC) if test "$have_doxygen" = "no"; then @@ -714,6 +717,15 @@ EOF # $4 = alternative module names (space separated, optional) # $5 = optional flags: # manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged +# $6 = optional parameters, allowed are (evaluated in this order): +# - RPM_DIST_PKG= +# special name for the RPM package +# - DEB_DIST_PKG= +# special name for the debian package +# - DIST_PKG= +# if the name of the package is different +# - DEV_DIST_PKG= +# if the name of the development package is different # # uses PKG_CHECK_MODULES to test for a module # then, if given, looks for the header file @@ -723,118 +735,11 @@ EOF AC_DEFUN([AX_PKG_REQUIRE], [ PKG_PROG_PKG_CONFIG optional_flags="$5" - $1_found=no - secondpar="m4_default([$2], [$1])" - PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ - $1_found=$secondpar - PKG_REQUIREMENTS+=" $secondpar" - ], [ - if test -n "$4"; then - AC_MSG_WARN([Recommended package $secondpar for feature $1 not installed, trying $4]) - for pkg in $4; do - PKG_CHECK_MODULES([$1], [$pkg], [ - PKG_REQUIREMENTS+=" $pkg" - $1_found=$pkg - break; - ], [ - AC_MSG_WARN([Recommended package $pkg for feature $1 not installed]) - ]) - done - fi - ]) - AC_SUBST(CPPFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(PKG_REQUIREMENTS) - if test -n "$3"; then - if test "${$1_found}" = "no"; then - tmp_package="yes" - else - tmp_package=${$1_found} - fi - $1_found=no - old_CPPFLAGS=${CPPFLAGS} - CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" - AC_CHECK_HEADER([$3], [ - $1_found=${tmp_package} - ], [ - for x in ${$1_CFLAGS}; do - AC_MSG_NOTICE([search for $3 in ${x[#]-I}]) - for f in $(find ${x[#]-I} -name "$3" 2> /dev/null); do - if test -f "$f"; then - $1_found=${tmp_package} - $1_CFLAGS+=" -I${f%/*}" - AC_MSG_NOTICE([added path ${f%/*}]) - break; - fi - done - if test "${$1_found}" != "no"; then - break; - fi - done - if test "${$1_found}" = "no"; then - tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package) - for x in ${tmp_includedir}; do - AC_MSG_NOTICE([search for $3 in $x]) - for f in $(find ${x} -name "$3" 2> /dev/null); do - if test -f "$f"; then - $1_found=${tmp_package} - $1_CFLAGS+=" -I${f%/*}" - AC_MSG_NOTICE([added path ${f%/*}]) - break; - fi - done - if test "${$1_found}" != "no"; then - break; - fi - done - fi - ]) - CPPFLAGS=${old_CPPFLAGS} + $6 + if test -n "$DEV_DIST_PKG"; then + DEV_DEB_DIST_PKG=${DEV_DIST_PKG}-dev + DEV_RPM_DIST_PKG=${DEV_DIST_PKG}-devel fi - if test "${$1_found}" = "no"; then - if test -n "$3"; then - if test -n "$4"; then - AC_MSG_ERROR([Feature $1 not found, need header $3 in modules $secondpar or $4]) - else - AC_MSG_ERROR([Feature $1 not found, need header $3 in module $secondpar]) - fi - else - AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) - fi - fi - AX_DEB_DEPEND([${$1_found}]) - AX_RPM_DEPEND([${$1_found}]) - [$1]_CPPFLAGS="${$1_CFLAGS}" - [$1]_CXXFLAGS="${$1_CFLAGS}" - AC_SUBST([$1]_CPPFLAGS) - AC_SUBST([$1]_CXXFLAGS) - if test "${optional_flags/manualflags/}" = "${optional_flags}"; then - CPPFLAGS+=" ${$1_CPPFLAGS}" - CXXFLAGS+=" ${$1_CXXFLAGS}" - LIBS+=" ${$1_LIBS}" - AC_MSG_NOTICE([Adding flags for $1]) - else - AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) - fi -]) - -# require a specific development package, with fallback: test for a header -# - parameter: -# $1 = unique id (no special characters) -# $2 = module name (optional, if different from id) -# $3 = a header file to find (optional) -# $4 = alternative module names (space separated, optional) -# $5 = optional flags: -# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged -# -# uses PKG_CHECK_MODULES to test for a module -# then, if given, looks for the header file -# if header file is not found, searches in alternative modules -# sets all flags, so that the module can be used everywhere -# fails if not found -AC_DEFUN([AX_PKG_REQUIRE_DEV], [ - PKG_PROG_PKG_CONFIG - optional_flags="$5" $1_found=no secondpar="m4_default([$2], [$1])" PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ @@ -914,8 +819,10 @@ AC_DEFUN([AX_PKG_REQUIRE_DEV], [ AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) fi fi - AX_DEB_BUILD_DEPEND([${$1_found}-dev]) - AX_RPM_BUILD_DEPEND([${$1_found}-devel]) + AX_DEB_BUILD_DEPEND([${DEV_DEB_DIST_PKG:-${DEB_DIST_PKG:-${DIST_PKG:-${$1_found}-dev}}}]) + AX_RPM_BUILD_DEPEND([${DEV_RPM_DIST_PKG:-${RPM_DIST_PKG:-${DIST_PKG:-${$1_found}-devel}}}]) + AX_DEB_DEPEND([${DEB_DIST_PKG:-${DIST_PKG:-${$1_found}}}]) + AX_RPM_DEPEND([${RPM_DIST_PKG:-${DIST_PKG:-${$1_found}}}]) [$1]_CPPFLAGS="${$1_CFLAGS}" [$1]_CXXFLAGS="${$1_CFLAGS}" AC_SUBST([$1]_CPPFLAGS) @@ -936,12 +843,26 @@ AC_DEFUN([AX_PKG_REQUIRE_DEV], [ # $2 = module name (optional, if different from id) # $3 = optional flags: # manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged +# $4 = optional parameters, allowed are (evaluated in this order): +# - RPM_DIST_PKG= +# special name for the RPM package +# - DEB_DIST_PKG= +# special name for the debian package +# - DIST_PKG= +# if the name of the package is different +# - DEV_DIST_PKG= +# if the name of the development package is different # # uses PKG_CHECK_MODULES to test for a module # sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) # sets all flags, so that the module can be used everywhere AC_DEFUN([AX_PKG_CHECK], [ optional_flags="$3" + $4 + if test -n "$DEV_DIST_PKG"; then + DEV_DEB_DIST_PKG=${DEV_DIST_PKG}-dev + DEV_RPM_DIST_PKG=${DEV_DIST_PKG}-devel + fi PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ HAVE_$1=1 @@ -965,52 +886,10 @@ AC_DEFUN([AX_PKG_CHECK], [ ], [ HAVE_$1=0 ]) - AX_DEB_BUILD_DEPEND(m4_default([$2], [$1])) - AX_RPM_BUILD_DEPEND(m4_default([$2], [$1])) - AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) - AC_SUBST(HAVE_$1) - AC_SUBST(CPPFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(PKG_REQUIREMENTS) -]) - -# check if a specific development package exists -# - parameter: -# $1 = unique id (no special characters) -# $2 = module name (optional, if different from id) -# $3 = optional flags: -# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged -# -# uses PKG_CHECK_MODULES to test for a module -# sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) -# sets all flags, so that the module can be used everywhere -AC_DEFUN([AX_PKG_CHECK_DEV], [ - optional_flags="$3" - PKG_PROG_PKG_CONFIG - PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ - HAVE_$1=1 - [$1]_CPPFLAGS="${$1_CFLAGS}" - [$1]_CXXFLAGS="${$1_CFLAGS}" - AC_SUBST([$1]_CPPFLAGS) - AC_SUBST([$1]_CXXFLAGS) - if test "${optional_flags/manualflags/}" = "${optional_flags}"; then - CPPFLAGS+=" ${$1_CPPFLAGS}" - CXXFLAGS+=" ${$1_CXXFLAGS}" - LIBS+=" ${$1_LIBS}" - AC_MSG_NOTICE([Adding flags for $1]) - else - AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) - fi - if test -z "$PKG_REQUIREMENTS"; then - PKG_REQUIREMENTS="m4_default([$2], [$1])" - else - PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, m4_default([$2], [$1])" - fi - ], [ - HAVE_$1=0 - ]) - AX_DEB_BUILD_DEPEND(m4_default([$2], [$1])-dev) - AX_RPM_BUILD_DEPEND(m4_default([$2], [$1])-devel) + AX_DEB_BUILD_DEPEND([${DEV_DEB_DIST_PKG:-${DEB_DIST_PKG:-${DIST_PKG:-m4_default([$2], [$1])-dev}}}]) + AX_RPM_BUILD_DEPEND([${DEV_RPM_DIST_PKG:-${RPM_DIST_PKG:-${DIST_PKG:-m4_default([$2], [$1])-devel}}}]) + AX_DEB_DEPEND([${DEB_DIST_PKG:-${DIST_PKG:-m4_default([$2], [$1])}}]) + AX_RPM_DEPEND([${RPM_DIST_PKG:-${DIST_PKG:-m4_default([$2], [$1])}}]) AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1) AC_SUBST(HAVE_$1) AC_SUBST(CPPFLAGS) @@ -1278,8 +1157,8 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [ # $1 = package name AC_DEFUN([AX_ALL_BUILD_DEPEND_DEV], [ pkg="$1" - DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}-dev" - RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}-devel" + DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg// /-dev}-dev" + RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg// /-devel}-devel" ]) # require package in .spec.in append @ALL_DEPEND@ to Depends @@ -1295,6 +1174,7 @@ AC_DEFUN([AX_ALL_DEPEND], [ fi ]) +# finish configuration - to be called instead of AC_OUTPUT AC_DEFUN([AX_OUTPUT], [ AX_DEB_RESOLVE AX_RPM_RESOLVE diff --git a/bootstrap.sh b/bootstrap.sh index d3ed892..c1bd79b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -307,13 +307,13 @@ for path in . .. ../.. ../../..; do if test -d ${path}/.svn; then VCS="svn" VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools," - VCSDEPENDS_RPM="subversion," + VCSDEPENDS_RPM="subversion, " echo -e " \e[32msuccess\e[0m detected ${VCS}" break elif test -d ${path}/.git; then VCS="git" VCSDEPENDS_DEB="git2cl, git," - VCSDEPENDS_RPM="git," + VCSDEPENDS_RPM="git, " echo -e " \e[32msuccess\e[0m detected ${VCS}" break fi @@ -1290,6 +1290,9 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs LDADD = -l${PACKAGE_NAME#lib} +exampledir = ${docdir}/examples +example_DATA = + MAINTAINERCLEANFILES = makefile.in EOF to --condition AX_BUILD_HTML_NPM html/package.json.in < 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia} -BuildRequires: rpm-sign %endif -%if 0%{?mageia} -BuildRequires: gnupg, lsb-release$( - if testtag AX_USE_LIBTOOL; then - echo -n ", libltdl-devel" - fi -) -%else -BuildRequires: gpg, redhat-lsb$( - if testtag AX_USE_LIBTOOL; then - echo -n ", libtool-ltdl-devel" - fi -) +$( + if testtag AX_USE_DOXYGEN; then cat < /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64) if test "${arg/:::/}" = "${arg}"; then - docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}" + docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}" else os="${arg%%:::*}" thenpart="${arg#*:::}" - if test "${thenpart/:::/}" = "${thenpart}"; then - docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi' - else + elsepart= + if test "${thenpart/:::/}" != "${thenpart}"; then elsepart="${thenpart##*:::}" - thenpart="${thenpart%:::*}" + thenpart="${thenpart%%:::*}" + fi + if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then if test -n "${thenpart}"; then - docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi' - else - docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi' - fi + docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" + fi + else + if test -n "${elsepart}"; then + docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}" + fi fi fi } @@ -295,7 +296,7 @@ EOF rm rpm-key done for repo in "${repos[@]}"; do - INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true)) + INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false)) ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'" ((++i)) done diff --git a/configure.ac b/configure.ac index d50c2d5..f589062 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AX_BUILD_EXAMPLES #AX_QT_NO_KEYWORDS AX_PKG_REQUIRE(mrwcxx, mrw-c++) -AX_DEB_BUILD_DEPEND(mrw-c++-dev) +AX_ALL_BUILD_DEPEND_DEV(mrw-c++) # create output AX_OUTPUT diff --git a/examples/makefile.am b/examples/makefile.am index 8bcdfce..89d9e0f 100644 --- a/examples/makefile.am +++ b/examples/makefile.am @@ -10,9 +10,11 @@ AM_CPPFLAGS = -I${top_srcdir}/src -I${top_srcdir}/src AM_LDFLAGS = -L${abs_top_builddir}/src/.libs LDADD = -lxml-cxx -noinst_PROGRAMS = address node_macros serialization \ - contain_serialization inherit_serialization \ - list_serialization optional_serialization +exampledir = ${docdir}/examples +example_PROGRAMS = address node_macros serialization \ + contain_serialization inherit_serialization \ + list_serialization optional_serialization +example_DATA = ${example_PROGRAMS:*=*.cxx} address_SOURCES = address.cxx node_macros_SOURCES = node_macros.cxx diff --git a/libxml-cxx.spec.in b/libxml-cxx.spec.in index 5393c95..aa5a1f6 100644 --- a/libxml-cxx.spec.in +++ b/libxml-cxx.spec.in @@ -1,39 +1,32 @@ Summary: @DESCRIPTION@ Name: @PACKAGE_NAME@ Version: @VERSION@ -Release: @BUILD_NUMBER@%{?dist} +Release: @BUILD_NUMBER@.@DISTRO@ License: LGPL Group: Development/Libraries/C++ + Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gnupg, subversion, subversion-tools, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, libtool, doxygen, java-openjdk, mrw-c++-devel -%if 0%{?fedora} != 20 -BuildRequires: graphviz -%endif -%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia} -BuildRequires: which, pkgconfig, cppunit-devel -%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia} -BuildRequires: rpm-sign -%endif -%if 0%{?mageia} -BuildRequires: gnupg, lsb-release, libltdl-devel +BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, cppunit-devel, doxygen, graphviz, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ + +#### os dependent definitions #### +%if 0%{?suse_version} || 0%{?sles_version} +BuildRequires: lsb-release +%else +%if 0%{?mageia} +BuildRequires: rpm-sign, lsb-release %else -BuildRequires: gpg, redhat-lsb, libtool-ltdl-devel +BuildRequires: rpm-sign, redhat-lsb +%endif %endif -%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) +%if ! 0%{?centos} BuildRequires: mscgen - -%else - %endif -%else%if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: pkg-config, lsb-release, libcppunit-devel -%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200 - +%if 0%{?mageia} +BuildRequires: libtool, libltdl-devel %else - +BuildRequires: libtool, libtool-ltdl-devel %endif -%endif%endif %description @README@ @@ -59,7 +52,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -/usr/%_lib/@PACKAGE_NAME@.so.* +/usr/%_lib/*.so.* + %doc /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS /usr/share/doc/packages/@PACKAGE_NAME@/COPYING @@ -71,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %package devel Summary: @DESCRIPTION@ Group: Development/Libraries/C++ -Requires: @PACKAGE_NAME@ = @VERSION@ +Requires: @PACKAGE_NAME@ = @VERSION@ @RPM_BUILD_DEPEND@ %description devel @README@ @@ -80,13 +74,14 @@ This Package contains all files required for developement. %files devel %defattr(-,root,root,-) -/usr/%_lib/@PACKAGE_NAME@.so -/usr/%_lib/@PACKAGE_NAME@.a -/usr/%_lib/@PACKAGE_NAME@.la +/usr/%_lib/*.so +/usr/%_lib/*.a +/usr/%_lib/*.la /usr/%_lib/pkgconfig /usr/include/* %doc /usr/share/doc/packages/@PACKAGE_NAME@/html +/usr/share/doc/packages/@PACKAGE_NAME@/examples %changelog diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index dd565a6..4a64ada 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -14,7 +14,7 @@ INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install - SCHROOTNAME="$1" PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) -TRAP_CMD= +TRAP_CMD="sleep ${SLEEP:-0};" DEPS= for f in BUILD BUILDROOT RPMS SPECS SRPMS; do if ! test -d $f; then @@ -48,7 +48,7 @@ if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then TRAP_CMD+="rm ${PACKAGE_NAME}.spec;" trap "${TRAP_CMD}" INT TERM EXIT sed 's,@\(\(ALL\|RPM\)_DEPEND_IFEXISTS\|\(ALL\|RPM\)_BUILD_DEPEND\|\(ALL\|RPM\)_DEPEND\)@,,g' ${PACKAGE_NAME}.spec.in | \ - sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec + sed 's,@[^@]*@,dummytext,g' > ${PACKAGE_NAME}.spec fi TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)