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

switch to libdb-devel (#814090)

Browse Source 
Resolves: rhbz#814090
This commit is contained in:
Joe Orton 2012-04-23 19:56:40 +01:00
parent de106c6ac6
commit 2cfa41d072
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subversion.spec
View File

@ -9,6 +9,12 @@
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%if 0%{?fedora} < 18
%define dbdevel db4-devel
%else
%define dbdevel libdb-devel
%endif
%{!?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_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
@ -20,7 +26,7 @@
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: 4%{?dist} Release: 5%{?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/
@ -40,7 +46,7 @@ Patch5: subversion-1.7.4-hashorder.patch
Patch6: subversion-1.7.4-httpd24.patch Patch6: subversion-1.7.4-httpd24.patch
Patch7: subversion-1.7.4-kwallet2.patch Patch7: subversion-1.7.4-kwallet2.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units
@ -473,6 +479,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Apr 23 2012 Joe Orton <jorton@redhat.com> - 1.7.4-5
- switch to libdb-devel (#814090)
* Thu Apr 19 2012 Joe Orton <jorton@redhat.com> - 1.7.4-4 * Thu Apr 19 2012 Joe Orton <jorton@redhat.com> - 1.7.4-4
- adapt for conf.modules.d with httpd 2.4 - adapt for conf.modules.d with httpd 2.4
- add possible workaround for kwallet crasher (#810861) - add possible workaround for kwallet crasher (#810861)