%bcond_without ruby # build without Ruby bindings
%bcond_without apache # build without Apache support (webdav, etc)
%bcond_without java # build without javahl support (Java high-level bindings)
-%bcond_without tests # don't perform "make check"
+%bcond_with 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
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.9
-Release: 2
+Version: 1.9.0
+Release: 1
License: Apache v2.0
Group: Development/Version Control
Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: bd495517a760ddd764ce449a891971db
+# Source0-md5: 20ae7b0d4ef07eeaf73eb4e23317b495
Source1: %{name}-dav_svn.conf
Source2: %{name}-authz_svn.conf
Source3: %{name}-svnserve.init
Patch2: %{name}-ruby-datadir-path.patch
Patch3: %{name}-tests.patch
URL: http://subversion.apache.org/
-%{?with_apache:BuildRequires: apache-devel >= 2.2.0-8}
+%{?with_apache:BuildRequires: apache-devel >= 2.4.14}
BuildRequires: apr-devel >= 1:1.0.0
BuildRequires: apr-util-devel >= 1:1.2.8-3
BuildRequires: autoconf >= 2.59
BuildRequires: dbus-devel
%endif
BuildRequires: db-devel >= 4.1.25
+%{!?with_db6:BuildRequires: db-devel < 6}
BuildRequires: expat-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
%{?with_kwallet:BuildRequires: kde4-kdelibs-devel}
%{?with_gnome:BuildRequires: libgnome-keyring-devel}
BuildRequires: libmagic-devel
%define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define skip_post_check_so libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.*
+%define skip_post_check_so libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.* libsvn_fs_x-1.so.*
%description
The goal of the Subversion project is to build a version control
%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
# 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}
%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_fs-1.so.0
%attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_util-1.so.0
+%attr(755,root,root) %{_libdir}/libsvn_fs_x-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_x-1.so.0
%attr(755,root,root) %{_libdir}/libsvn_ra-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_ra-1.so.0
%attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so.*.*.*
%endif
%attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so
%attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
+%attr(755,root,root) %{_libdir}/libsvn_fs_x-1.so
%attr(755,root,root) %{_libdir}/libsvn_ra-1.so
%attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so
%attr(755,root,root) %{_libdir}/libsvn_ra_serf-1.so
%endif
%{_libdir}/libsvn_fs_fs-1.la
%{_libdir}/libsvn_fs_util-1.la
+%{_libdir}/libsvn_fs_x-1.la
%{_libdir}/libsvn_ra-1.la
%{_libdir}/libsvn_ra_local-1.la
%{_libdir}/libsvn_ra_serf-1.la
%{_libdir}/libsvn_repos-1.la
%{_libdir}/libsvn_subr-1.la
%{_libdir}/libsvn_wc-1.la
+%{_npkgconfigdir}/libsvn_client.pc
+%{_npkgconfigdir}/libsvn_delta.pc
+%{_npkgconfigdir}/libsvn_diff.pc
+%{_npkgconfigdir}/libsvn_fs.pc
+%if %{without net_client_only}
+%{_npkgconfigdir}/libsvn_fs_base.pc
+%endif
+%{_npkgconfigdir}/libsvn_fs_fs.pc
+%{_npkgconfigdir}/libsvn_fs_util.pc
+%{_npkgconfigdir}/libsvn_fs_x.pc
+%{_npkgconfigdir}/libsvn_ra.pc
+%{_npkgconfigdir}/libsvn_ra_local.pc
+%{_npkgconfigdir}/libsvn_ra_serf.pc
+%{_npkgconfigdir}/libsvn_ra_svn.pc
+%{_npkgconfigdir}/libsvn_repos.pc
+%{_npkgconfigdir}/libsvn_subr.pc
+%{_npkgconfigdir}/libsvn_wc.pc
%{_includedir}/%{name}-1
%{_examplesdir}/%{name}-%{version}
%endif
%{_libdir}/libsvn_fs_fs-1.a
%{_libdir}/libsvn_fs_util-1.a
+%{_libdir}/libsvn_fs_x-1.a
%{_libdir}/libsvn_ra-1.a
%{_libdir}/libsvn_ra_local-1.a
%{_libdir}/libsvn_ra_serf-1.a
%attr(755,root,root) %{_bindir}/svndiff4
# tools/server-side
-%attr(755,root,root) %{_bindir}/fsfs-stats
+%attr(755,root,root) %{_bindir}/svnfsfs
%attr(755,root,root) %{_bindir}/svn-populate-node-origins-index
-%attr(755,root,root) %{_bindir}/svn-rep-sharing-stats
%attr(755,root,root) %{_bindir}/svnauthz
%attr(755,root,root) %{_bindir}/svnauthz-validate
# tools/client-side
-%attr(755,root,root) %{_bindir}/svn-bench
+%attr(755,root,root) %{_bindir}/svnbench
# tools/dev/svnraisetreeconflict
%attr(755,root,root) %{_bindir}/svnraisetreeconflict
# tools/dev/
%attr(755,root,root) %{_bindir}/fsfs-access-map
-%attr(755,root,root) %{_bindir}/fsfs-reorg
+%attr(755,root,root) %{_bindir}/x509-parser
%files -n bash-completion-subversion
%defattr(644,root,root,755)
%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