improvement of rpm generation
This commit is contained in:
Marc Wäckerlin
149
bootstrap.sh
149
bootstrap.sh
@@ -303,17 +303,22 @@ done
|
||||
echo -en "\e[1m-> checking:\e[0m for version control system ..."
|
||||
VCS=""
|
||||
VCSDEPENDS=""
|
||||
if test -d .svn; then
|
||||
VCS="svn"
|
||||
VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
|
||||
VCSDEPENDS_RPM="subversion,"
|
||||
echo -e " \e[32msuccess\e[0m detected ${VCS}"
|
||||
elif test -d .git; then
|
||||
VCS="git"
|
||||
VCSDEPENDS_DEB="git2cl, git,"
|
||||
VCSDEPENDS_RPM="git,"
|
||||
echo -e " \e[32msuccess\e[0m detected ${VCS}"
|
||||
else
|
||||
for path in . .. ../.. ../../..; do
|
||||
if test -d ${path}/.svn; then
|
||||
VCS="svn"
|
||||
VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
|
||||
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, "
|
||||
echo -e " \e[32msuccess\e[0m detected ${VCS}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$VCS"; then
|
||||
echo -e " \e[33mignored\e[0m"
|
||||
fi
|
||||
|
||||
@@ -634,7 +639,7 @@ LANGUAGE_FILE_BASE = ${PACKAGE_NAME}
|
||||
QT_PLUGINS = iconengines imageformats platforms
|
||||
|
||||
#### enable if you deliver a KDE/Gnome desktop file
|
||||
#applicationsdir = ${datarootdir}/applications
|
||||
#applicationsdir = \${datarootdir}/applications
|
||||
#dist_applications_DATA = ${PACKAGE_NAME}.desktop
|
||||
|
||||
#### enable (ev. instead of bin_PROGRAMS) if you build a library
|
||||
@@ -671,25 +676,26 @@ ${PACKAGE_NAME//-/_}_TR_FILES = main.cxx version.cxx
|
||||
${PACKAGE_NAME//-/_}_SOURCES = \${${PACKAGE_NAME//-/_}_TR_FILES} \${BUILT_SOURCES}
|
||||
|
||||
## automatic assembly, no need to change
|
||||
BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \
|
||||
\${${PACKAGE_NAME//-/_}_UIFILES} \
|
||||
\${${PACKAGE_NAME//-/_}_TRANSLATIONS} \
|
||||
BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \\
|
||||
\${${PACKAGE_NAME//-/_}_UIFILES} \\
|
||||
\${${PACKAGE_NAME//-/_}_TRANSLATIONS} \\
|
||||
\${${PACKAGE_NAME//-/_}_RESOURCES}
|
||||
|
||||
## automatic assembly, no need to change
|
||||
EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \
|
||||
EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \\
|
||||
\${${PACKAGE_NAME//-/_}_UIFILES:ui_%.hxx=%.ui}
|
||||
|
||||
## automatic assembly, no need to change
|
||||
## except: adapt the pre-delivered qt_%.qm list (language files you copy from qt
|
||||
EXTRA_DIST = \${EXTRA_DIST_TR} \
|
||||
\${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx:%.qrc} \
|
||||
\${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \
|
||||
EXTRA_DIST = \${EXTRA_DIST_TR} \\
|
||||
\${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx=%.qrc} \\
|
||||
\${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \\
|
||||
qt_de.qm qt_fr.qm
|
||||
|
||||
## automatic assembly, no need to change
|
||||
LANGUAGE_FILES = \${EXTRA_DIST_TR} \${${PACKAGE_NAME//-/_}_TR_FILES}
|
||||
|
||||
CLEANFILES = \${${PACKAGE_NAME//-/_}_RESOURCES}
|
||||
MAINTAINERCLEANFILES = makefile.in
|
||||
EOF
|
||||
to --condition AX_USE_CXX src/main.cxx <<EOF
|
||||
@@ -1607,62 +1613,39 @@ fi)
|
||||
$(if testtag AX_RPM_DEPEND; then echo "Requires: @RPM_DEPEND@"; fi)
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: gnupg, expect, ${VCSDEPENDS_RPM} make, automake, autoconf, rpm-build$(
|
||||
BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
|
||||
if testtag AX_USE_CXX; then
|
||||
echo -n ", binutils-devel, gcc-c++"
|
||||
fi
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libtool";
|
||||
echo -n ", libtool, libtool-ltdl-devel"
|
||||
fi
|
||||
if testtag AX_USE_CPPUNIT; then
|
||||
echo -n ", cppunit-devel"
|
||||
fi
|
||||
if testtag AX_USE_DOXYGEN; then
|
||||
echo -n ", doxygen, java-openjdk";
|
||||
echo -n ", doxygen, graphviz, java-openjdk";
|
||||
fi
|
||||
if testtag AX_USE_PERLDOC; then
|
||||
echo -n ", libpod-tree-perl";
|
||||
fi
|
||||
if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then
|
||||
echo -n ", qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel";
|
||||
fi
|
||||
) @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
|
||||
%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} || 0%{?mageia}
|
||||
BuildRequires: which, pkgconfig$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", cppunit-devel"
|
||||
fi
|
||||
)
|
||||
%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$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libltdl-devel"
|
||||
fi
|
||||
)
|
||||
|
||||
#### os dependent definitions ####
|
||||
%if 0%{?suse_version} || 0%{?sles_version}
|
||||
BuildRequires: lsb-release
|
||||
%else
|
||||
BuildRequires: gpg, redhat-lsb$(
|
||||
if testtag AX_USE_LIBTOOL; then
|
||||
echo -n ", libtool-ltdl-devel"
|
||||
fi
|
||||
)
|
||||
%endif
|
||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
|
||||
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
|
||||
%else
|
||||
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi)
|
||||
%endif
|
||||
%else%if 0%{?suse_version} || 0%{?sles_version}
|
||||
BuildRequires: pkg-config, lsb-release$(
|
||||
if testtag AX_USE_CPPUNIT; then
|
||||
echo -n ", libcppunit-devel";
|
||||
fi)
|
||||
%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200
|
||||
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
|
||||
%else
|
||||
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
|
||||
%endif
|
||||
%endif%endif
|
||||
BuildRequires: rpm-sign, redhat-lsb
|
||||
%endif$(
|
||||
if testtag AX_USE_DOXYGEN; then cat <<EOS
|
||||
%if ! 0%{?centos}
|
||||
BuildRequires: mscgen
|
||||
%fi
|
||||
EOS
|
||||
fi)
|
||||
|
||||
%description
|
||||
@README@
|
||||
@@ -1831,27 +1814,29 @@ EOF
|
||||
|
||||
#### Cleanup If Makefile Exists ####
|
||||
if test -f makefile; then
|
||||
run --no-check make distclean
|
||||
fi
|
||||
|
||||
#### Bootstrap Before Configure ####
|
||||
run --no-check vcs2cl
|
||||
run aclocal
|
||||
if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
|
||||
run automake -a
|
||||
run autoconf
|
||||
|
||||
#### Run Configure If User Requires ####
|
||||
if test "$configure" -eq 1; then
|
||||
./configure $* || exit 1
|
||||
fi
|
||||
|
||||
#### Run Make If User Requires ####
|
||||
if test "$build" -eq 1; then
|
||||
make $buildtarget || exit 1
|
||||
run --no-check make maintainer-clean
|
||||
fi
|
||||
|
||||
#### Build In Docker If User Requires ####
|
||||
if test "$docker" -eq 1; then
|
||||
./build-in-docker.sh || exit 1
|
||||
./build-in-docker.sh $buildtarget $* || exit 1
|
||||
else
|
||||
|
||||
#### Bootstrap Before Configure ####
|
||||
run --no-check vcs2cl
|
||||
run aclocal
|
||||
if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
|
||||
run automake -a
|
||||
run autoconf
|
||||
|
||||
#### Run Configure If User Requires ####
|
||||
if test "$configure" -eq 1; then
|
||||
./configure $* || exit 1
|
||||
fi
|
||||
|
||||
#### Run Make If User Requires ####
|
||||
if test "$build" -eq 1; then
|
||||
make $buildtarget || exit 1
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user