rpms/subversion
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix build with httpd 2.4

Browse Source
This commit is contained in:
Joe Orton 2012-03-30 20:05:57 +01:00
parent 696a60d5ac
commit 061c4e0e93
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subversion.spec
View File

@ -11,10 +11,13 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.7.4 Version: 1.7.4
Release: 1%{?dist} Release: 2%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Development/Tools Group: Development/Tools
URL: http://subversion.apache.org/ URL: http://subversion.apache.org/
@ -108,7 +111,7 @@ passwords in the KDE Wallet.
%package -n mod_dav_svn %package -n mod_dav_svn
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: Apache httpd module for Subversion server Summary: Apache httpd module for Subversion server
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing) Requires: httpd-mmn = %{_httpd_mmn}
Requires: subversion-libs%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
BuildRequires: httpd-devel >= 2.0.45 BuildRequires: httpd-devel >= 2.0.45
@ -177,7 +180,8 @@ This package includes supplementary tools for use with Subversion.
# 2) the swig bindings are regenerated using the system swig # 2) the swig bindings are regenerated using the system swig
# (2) is not ideal since typically upstream test with a different # (2) is not ideal since typically upstream test with a different
# swig version # swig version
./autogen.sh --release # This PATH order is makes the fugly test for libtoolize work...
PATH=/usr/bin:$PATH ./autogen.sh --release
# fix shebang lines, #111498 # fix shebang lines, #111498
perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@ -195,7 +199,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
--with-swig --with-neon=%{_prefix} \ --with-swig --with-neon=%{_prefix} \
--with-ruby-sitedir=%{ruby_vendorarchdir} \ --with-ruby-sitedir=%{ruby_vendorarchdir} \
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \ --with-apxs=%{_httpd_apxs} --disable-mod-activation \
--disable-static --with-sasl=%{_prefix} \ --disable-static --with-sasl=%{_prefix} \
--disable-neon-version-check \ --disable-neon-version-check \
--with-gnome-keyring \ --with-gnome-keyring \
@ -453,6 +457,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Mar 30 2012 Joe Orton <jorton@redhat.com> - 1.7.4-2
- fix build with httpd 2.4
* Mon Mar 12 2012 Joe Orton <jorton@redhat.com> - 1.7.4-1 * Mon Mar 12 2012 Joe Orton <jorton@redhat.com> - 1.7.4-1
- update to 1.7.4 - update to 1.7.4
- fix build with httpd 2.4 - fix build with httpd 2.4