build fixes for rpm
This commit is contained in:
@@ -13,7 +13,6 @@ m4_define(x_least, mrw_esyscmd_s([
|
||||
for path in . .. ../..; do
|
||||
if svn info $path 2>&1 > /dev/null; then
|
||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||
(cd $path && svn2cl) 2> /dev/null > /dev/null
|
||||
break;
|
||||
fi
|
||||
done
|
||||
@@ -28,7 +27,6 @@ m4_define(x_minor_fixed, mrw_esyscmd_s([
|
||||
for path in . .. ../..; do
|
||||
if svn info $path 2>&1 > /dev/null; then
|
||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||
(cd $path && svn2cl) 2> /dev/null > /dev/null
|
||||
break;
|
||||
fi
|
||||
done
|
||||
|
@@ -839,6 +839,7 @@ if test -f makefile; then
|
||||
fi
|
||||
|
||||
#### Bootstrap Before Configure ####
|
||||
run --no-check svn2cl
|
||||
run aclocal
|
||||
run libtoolize --force
|
||||
run automake -a
|
||||
|
@@ -11,12 +11,12 @@ BuildRequires: graphviz
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||
BuildRequires: subversion-svn2cl, pkgconfig, cppunit-devel, redhat-lsb
|
||||
BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
|
||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||
BuildRequires: mscgen
|
||||
%endif
|
||||
%else%if 0%{?suse_version} || 0%{?sles_version}
|
||||
BuildRequires: svn2cl, pkg-config, libcppunit-devel, lsb-release
|
||||
BuildRequires: pkg-config, libcppunit-devel, lsb-release
|
||||
%endif%endif
|
||||
|
||||
%description
|
||||
|
Reference in New Issue
Block a user