Debian sid is mor restrictive in time format
This commit is contained in:
@@ -131,7 +131,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
|||||||
AX_SUBST(DISTRO)
|
AX_SUBST(DISTRO)
|
||||||
BUILD_NUMBER=${BUILD_NUMBER:-1}
|
BUILD_NUMBER=${BUILD_NUMBER:-1}
|
||||||
AX_SUBST(BUILD_NUMBER)
|
AX_SUBST(BUILD_NUMBER)
|
||||||
BUILD_DATE=$(LANG= date +"%a, %d %B %Y %H:%M:%S %z")
|
BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
|
||||||
AX_SUBST(BUILD_DATE)
|
AX_SUBST(BUILD_DATE)
|
||||||
if test -f "${PROJECT_NAME}-logo.png"; then
|
if test -f "${PROJECT_NAME}-logo.png"; then
|
||||||
PROJECT_LOGO="${PROJECT_NAME}-logo.png"
|
PROJECT_LOGO="${PROJECT_NAME}-logo.png"
|
||||||
|
24
bootstrap.sh
24
bootstrap.sh
@@ -19,6 +19,7 @@ PROJECT_PATH=$(pwd)
|
|||||||
DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/}
|
DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/}
|
||||||
configure=0
|
configure=0
|
||||||
build=0
|
build=0
|
||||||
|
buildtarget="distcheck"
|
||||||
overwrite=0
|
overwrite=0
|
||||||
rebuild=0
|
rebuild=0
|
||||||
rebuildfiles=()
|
rebuildfiles=()
|
||||||
@@ -26,6 +27,7 @@ while test $# -gt 0; do
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
(--configure|-c) configure=1;;
|
(--configure|-c) configure=1;;
|
||||||
(--build|-b) configure=1; build=1;;
|
(--build|-b) configure=1; build=1;;
|
||||||
|
(--target|-t) shift; configure=1; build=1; buildtarget="$1";;
|
||||||
(--overwrite|-o) overwrite=1;;
|
(--overwrite|-o) overwrite=1;;
|
||||||
(--rebuild|-r) rebuild=1;;
|
(--rebuild|-r) rebuild=1;;
|
||||||
(--rebuild-file|-f) shift; rebuildfiles+=("$1");;
|
(--rebuild-file|-f) shift; rebuildfiles+=("$1");;
|
||||||
@@ -40,7 +42,8 @@ SYNOPSIS
|
|||||||
OPTIONS
|
OPTIONS
|
||||||
|
|
||||||
--configure, -c call ./configure after initialization
|
--configure, -c call ./configure after initialization
|
||||||
--build, -c build, also call ./configure && make
|
--build, -b build, also call ./configure && make distcheck
|
||||||
|
--target, -t target build target , also call ./configure && make target
|
||||||
--overwrite, -o overwrite all basic files (bootstrap.sh, m4-macros)
|
--overwrite, -o overwrite all basic files (bootstrap.sh, m4-macros)
|
||||||
--rebuild, -r force rebuild of generated files, even if modified
|
--rebuild, -r force rebuild of generated files, even if modified
|
||||||
--rebuild-file, -f <file> rebild specific file (can be added multiple times)
|
--rebuild-file, -f <file> rebild specific file (can be added multiple times)
|
||||||
@@ -732,11 +735,14 @@ else
|
|||||||
echo Applications/...;
|
echo Applications/...;
|
||||||
fi)
|
fi)
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: gnupg, subversion, automake, autoconf$(
|
BuildRequires: gnupg, subversion, automake, autoconf$(
|
||||||
if testtag AX_USE_DOXYGEN; then
|
if testtag AX_USE_DOXYGEN; then
|
||||||
echo -n ", doxygen, graphviz";
|
echo -n ", doxygen";
|
||||||
fi)
|
fi)
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
%if 0%{?fedora} != 20
|
||||||
|
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
|
||||||
|
%endif
|
||||||
%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, redhat-lsb$(
|
BuildRequires: pkgconfig, redhat-lsb$(
|
||||||
if testtag AX_USE_CPPUNIT; then
|
if testtag AX_USE_CPPUNIT; then
|
||||||
@@ -788,15 +794,21 @@ rm -rf \$RPM_BUILD_ROOT
|
|||||||
$(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
|
else
|
||||||
/usr/bin/
|
echo /usr/bin/*
|
||||||
fi)
|
fi)
|
||||||
%doc
|
%doc
|
||||||
|
$(if testtag AX_USE_LIBTOOL; then
|
||||||
|
cat <<EOF2
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
|
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
|
/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
|
/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
|
/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
|
/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
||||||
|
EOF2
|
||||||
|
else
|
||||||
|
echo /usr/share/*
|
||||||
|
fi)
|
||||||
|
|
||||||
$(if testtag AX_USE_LIBTOOL; then
|
$(if testtag AX_USE_LIBTOOL; then
|
||||||
cat <<EOF2
|
cat <<EOF2
|
||||||
@@ -816,7 +828,7 @@ This Package contains all files required for developement.
|
|||||||
/usr/%_lib/@PACKAGE_NAME@.a
|
/usr/%_lib/@PACKAGE_NAME@.a
|
||||||
/usr/%_lib/@PACKAGE_NAME@.la
|
/usr/%_lib/@PACKAGE_NAME@.la
|
||||||
/usr/%_lib/pkgconfig
|
/usr/%_lib/pkgconfig
|
||||||
/usr/include/
|
/usr/include/*
|
||||||
%doc
|
%doc
|
||||||
/usr/share/doc/packages/@PACKAGE_NAME@/html
|
/usr/share/doc/packages/@PACKAGE_NAME@/html
|
||||||
EOF2
|
EOF2
|
||||||
@@ -869,5 +881,5 @@ fi
|
|||||||
|
|
||||||
#### Run Make If User Requires ####
|
#### Run Make If User Requires ####
|
||||||
if test "$build" -eq 1; then
|
if test "$build" -eq 1; then
|
||||||
make
|
make $buildtarget
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user