libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

build fixes for rpm

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-29 12:27:11 +00:00
parent 33d7fd30a8
commit 4fdc7864c1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ax_init_standard_project.m4
View File

@@ -13,7 +13,6 @@ m4_define(x_least, mrw_esyscmd_s([
for path in . .. ../..; do for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then if svn info $path 2>&1 > /dev/null; then
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
(cd $path && svn2cl) 2> /dev/null > /dev/null
break; break;
fi fi
done done
@@ -28,7 +27,6 @@ m4_define(x_minor_fixed, mrw_esyscmd_s([
for path in . .. ../..; do for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then if svn info $path 2>&1 > /dev/null; then
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
(cd $path && svn2cl) 2> /dev/null > /dev/null
break; break;
fi fi
done done

1
bootstrap.sh
View File

@@ -839,6 +839,7 @@ if test -f makefile; then
fi fi
#### Bootstrap Before Configure #### #### Bootstrap Before Configure ####
run --no-check svn2cl
run aclocal run aclocal
run libtoolize --force run libtoolize --force
run automake -a run automake -a

4
mrw-c++.spec.in
View File

@@ -11,12 +11,12 @@ BuildRequires: graphviz
%endif %endif
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: subversion-svn2cl, pkgconfig, cppunit-devel, redhat-lsb BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
%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} %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 %endif%endif
%description %description