%bcond_without perl # build without Perl bindings
%bcond_without ruby # build without Ruby bindings
%bcond_without apache # build without Apache support (webdav, etc)
-%bcond_without javahl # build without javahl support (Java high-level bindings)
+%bcond_without java # build without javahl support (Java high-level bindings)
%bcond_without tests # don't perform "make check"
%bcond_without kwallet # build without kde4 wallet support
%bcond_without kde # build without kde4 support (alias for kwallet)
%bcond_without gnome # build without gnome keyring support
%bcond_without db # disable Subversion Berkeley DB based filesystem library
+%bcond_with db6 # allow BDB6 (not tested by upstream, released on AGPL)
-# for AC: --without csvn,gnome,javahl,kde,ruby
+# for AC: --without csvn,gnome,java,kde,ruby
%if %{with net_client_only}
%undefine with_apache
%undefine with_db
%undefine with_swig
-%undefine with_javahl
+%undefine with_java
+%undefine with_csvn
+%undefine with_gnome
+%undefine with_kde
%endif
%if %{without swig}
Summary(pl.UTF-8): System kontroli wersji podobny, ale lepszy, niż CVS
Summary(pt_BR.UTF-8): Sistema de versionamento concorrente
Name: subversion
-Version: 1.8.3
+Version: 1.8.11
Release: 1
License: Apache v2.0
Group: Development/Version Control
-Source0: http://www.idg.pl/mirrors/apache/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: 7d7bd97347a4491e1ffb529563ce2e9e
+Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
+# Source0-md5: 766a89bbbb388f8eb76166672d3b9e49
Source1: %{name}-dav_svn.conf
Source2: %{name}-authz_svn.conf
Source3: %{name}-svnserve.init
BuildRequires: dbus-devel
%endif
BuildRequires: db-devel >= 4.1.25
+%{!?with_db6:BuildRequires: db-devel < 6}
BuildRequires: expat-devel
BuildRequires: gettext-devel
%{?with_kwallet:BuildRequires: kde4-kdelibs-devel}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.656
BuildRequires: sed >= 4.0
+BuildRequires: serf-devel >= 1.2.1
BuildRequires: sqlite3-devel >= 3.6.18
BuildRequires: texinfo
BuildRequires: which
-BuildRequires: serf-devel >= 1.2.1
-%if %{with javahl}
+%if %{with java}
BuildRequires: jdk >= 1.5
BuildRequires: libstdc++-devel
%endif
%if %{with ruby}
BuildRequires: rpm-rubyprov
BuildRequires: ruby-devel >= 1:1.8.2
+BuildRequires: ruby-irb
BuildRequires: ruby-rubygems
BuildRequires: swig-ruby >= 1.3.24
%endif
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: apr-util-devel >= 1:1.0.0
+Requires: serf-devel >= 1.2.1
Obsoletes: libsubversion0-devel
%description devel
Requires: %{name} = %{version}-%{release}
Requires: bash-completion
Conflicts: %{name}-tools <= 1.1.0-0.rc6.1
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
%description -n bash-completion-subversion
Bash completion for subversion.
--disable-mod-activation \
%if %{with db}
--with-berkeley-db="db.h:%{_includedir}:%{_libdir}:db" \
+ %{?with_db6:--enable-bdb6} \
%else
--without-berkeley-db \
%endif
%if %{with csvn}
--with-ctypesgen=%{_bindir}/ctypesgen.py \
%endif
-%if %{with javahl}
+%if %{with java}
--enable-javahl \
--with-jdk="%{java_home}" \
--without-jikes \
%{__make} -j1
cd -
%endif
-%if %{with javahl}
+%if %{with java}
%{__make} -j1 javahl \
javahl_javadir="%{_javadir}"
%endif
toolsdir=%{_bindir} \
DESTDIR=$RPM_BUILD_ROOT \
APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
-%if %{with javahl}
+%if %{with java}
install-javahl \
javahl_javadir="%{_javadir}" \
%endif
%if %{with ruby}
%{__make} install -j1 \
+ SWIG_RB_RI_DATADIR=$RPM_BUILD_ROOT%{ruby_ridir} \
DESTDIR=$RPM_BUILD_ROOT \
- install-swig-rb install-swig-rb-doc \
+ install-swig-rb install-swig-rb-doc
# not our package
%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/OptionParser
%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Time
+%if "%{ruby_version}" >= "2.0"
+%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/File
+%endif
%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
%endif
cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%if %{with javahl}
+%if %{with java}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}
%endif
%if %{with swig}
%endif # net_client_only
-%if %{with javahl}
+%if %{with java}
%files -n java-subversion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsvnjavahl-1.so.*.*.*
%dir %{perl_vendorarch}/auto/SVN
%dir %{perl_vendorarch}/auto/SVN/*
%attr(755,root,root) %{perl_vendorarch}/auto/SVN/*/*.so
-%{perl_vendorarch}/auto/SVN/*/*.bs
%{_mandir}/man3/*.3pm*
%endif