%define pdir SVN
%define pnam _Core
Summary: A Concurrent Versioning system similar to but better than CVS
-Summary(pl): System kontroli wersji podobny, ale lepszy, ni¿ CVS
-Summary(pt_BR): Sistema de versionamento concorrente
+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.4.0
-Release: 2
+Version: 1.4.4
+Release: 4
License: Apache/BSD Style
Group: Development/Version Control
Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 6f7485986776204138a1d221ac5eec40
+# Source0-md5: 702655defa418bab8f683f6268b4fd30
Source1: %{name}-dav_svn.conf
Source2: %{name}-authz_svn.conf
Source3: %{name}-svnserve.init
Source4: %{name}-svnserve.sysconfig
+Source5: %{name}-convert-typemaps-to-ifdef.py
Patch0: %{name}-home_etc.patch
Patch1: %{name}-DESTDIR.patch
Patch2: %{name}-neon.patch
+Patch3: %{name}-python_bindings.patch
URL: http://subversion.tigris.org/
%if %{with net_client_only}
%global apache_modules_api 0
%endif
%endif
BuildRequires: apr-devel >= 1:1.0.0
-BuildRequires: apr-util-devel >= 1:1.2.7-4
+BuildRequires: apr-util-devel >= 1:1.2.8-3
BuildRequires: autoconf >= 2.59
BuildRequires: bison
BuildRequires: expat-devel
BuildRequires: gettext-devel
BuildRequires: libtool >= 1.4-9
BuildRequires: neon-devel >= 0.26.0
-%if %{with python}
BuildRequires: python >= 2.2
-BuildRequires: python-devel >= 2.2
BuildRequires: python-modules >= 2.2
+%if %{with python}
+BuildRequires: python-devel >= 2.2
BuildRequires: sed >= 4.0
BuildRequires: swig-python >= 1.3.24
%endif
BuildRequires: texinfo
BuildRequires: which
+# update -neon patch before messing with this BC
+BuildConflicts: neon-devel > 0.26.3
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
- Internationalization
- Progressive multi-lingual support
-%description -l pl
+%description -l pl.UTF-8
Celem projektu Subversion jest stworzenie systemu kontroli wersji jako
zamiennika dla CVS.
Cele projektu to:
-- Wszystkie aktualne mo¿liwo¶ci CVS.
-- Katalogi, zmiany nazw oraz meta-dane plików s± wersjonowane.
-- Wsparcie dla linków symbolicznych itp.
-- Commity s± w pe³ni atomowe.
-- Branchowanie oraz tagowanie s± tanimi (sta³ymi w czasie) operacjami.
-- Powtarzaj±ce merge.
-- Wsparcie dla pluginów diff'a po stronie klienta.
+- Wszystkie aktualne możliwości CVS.
+- Katalogi, zmiany nazw oraz metadane plików są wersjonowane.
+- Obsługa dowiązań symbolicznych itp.
+- Commity są w pełni atomowe.
+- Branchowanie oraz tagowanie są tanimi (stałymi w czasie) operacjami.
+- Dobra obsługa powtarzanego łączenia (merge).
+- Obsługa wtyczek diff po stronie klienta.
- Natywny klient/serwer.
-- Klient/Serwer przesy³aj± diffy w obu kierunkach.
+- Klient/Serwer przesyłają diffy w obu kierunkach.
- Koszty proporcjonalne do rozmiaru zmiany, a nie rozmiaru projektu.
- Internacjonalizacja.
-- Postêpuj±ce wsparcie dla wielu jêzyków.
+- Postępujące wsparcie dla wielu języków.
-%description -l pt_BR
-O objetivo do projeto Subversion é construir um sistema de controle de
-versões que seja um substituto para o CVS (Concurrent Versioning
+%description -l pt_BR.UTF-8
+O objetivo do projeto Subversion é construir um sistema de controle de
+versões que seja um substituto para o CVS (Concurrent Versioning
System) na comunidade opensource, fornecendo grandes melhorias.
%package libs
Summary: Subversion libraries and modules
-Summary(pl): Biblioteka subversion oraz ³adowalne modu³y
+Summary(pl.UTF-8): Biblioteka subversion oraz ładowalne moduły
Group: Libraries
-Requires: neon >= 0.24.7
+Requires: neon >= 0.26.0
Obsoletes: libsubversion0
%description libs
Subversion libraries and modules.
-%description libs -l pl
-Biblioteka subversion oraz ³adowalne modu³y.
+%description libs -l pl.UTF-8
+Biblioteka subversion oraz ładowalne moduły.
%package devel
Summary: Header files and develpment documentation for subversion
-Summary(pl): Pliki nag³ówkowe i dokumetacja do subversion
-Summary(pt_BR): Arquivos de desenvolvimento para o Subversion
+Summary(pl.UTF-8): Pliki nagłówkowe i dokumetacja do subversion
+Summary(pt_BR.UTF-8): Arquivos de desenvolvimento para o Subversion
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: apr-util-devel >= 1:1.0.0
-Requires: neon-devel >= 0.24.7
+Requires: neon-devel >= 0.26.0
Obsoletes: libsubversion0-devel
%description devel
Header files and develpment documentation for subversion.
-%description devel -l pl
-Pliki nag³ówkowe i dokumetacja do subversion.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i dokumetacja do subversion.
-%description devel -l pt_BR
-Este pacote provê os arquivos necessários para desenvolvedores
+%description devel -l pt_BR.UTF-8
+Este pacote provê os arquivos necessários para desenvolvedores
interagirem com o Subversion.
%package static
Summary: Static subversion library
-Summary(pl): Biblioteka statyczna subversion
-Summary(pt_BR): Sistema de versionamento concorrente
+Summary(pl.UTF-8): Biblioteka statyczna subversion
+Summary(pt_BR.UTF-8): Sistema de versionamento concorrente
Group: Development/Libraries
Requires: %{name}-devel = %{version}
Obsoletes: libsubversion0-static-devel
%description static
Static subversion library.
-%description static -l pl
+%description static -l pl.UTF-8
Biblioteka statyczna subversion.
-%description static -l pt_BR
-Este pacote provê um cliente estático do subversion.
+%description static -l pt_BR.UTF-8
+Este pacote provê um cliente estático do subversion.
%package svnserve
Summary: Subversion svnserve
-Summary(pl): Subversion svnserve
+Summary(pl.UTF-8): Subversion svnserve
Group: Networking/Daemons
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}-%{release}
%description svnserve
Subversion svnserve server.
-%description svnserve -l pl
+%description svnserve -l pl.UTF-8
Serwer subversion svnserve.
%package tools
Summary: Subversion tools and scripts
-Summary(pl): Narzêdzia oraz skrypty dla subversion
-Summary(pt_BR): Módulos python para acessar os recursos do Subversion
+Summary(pl.UTF-8): Narzędzia oraz skrypty dla subversion
+Summary(pt_BR.UTF-8): Módulos python para acessar os recursos do Subversion
Group: Applications
%pyrequires_eq python
Requires: %{name} = %{version}-%{release}
%description tools
Subversion tools and scripts.
-%description tools -l pl
-Narzêdzia oraz skrypty dla subversion.
+%description tools -l pl.UTF-8
+Narzędzia oraz skrypty dla subversion.
%package -n bash-completion-subversion
Summary: bash completion for subversion
-Summary(pl): Dope³nienia basha dla subversion
+Summary(pl.UTF-8): Dopełnienia basha dla subversion
Group: Applications/Shells
Requires: %{name} = %{version}-%{release}
Requires: bash-completion
%description -n bash-completion-subversion
Bash completion for subversion.
-%description -n bash-completion-subversion -l pl
-Dope³nienia basha dla subversion.
+%description -n bash-completion-subversion -l pl.UTF-8
+Dopełnienia basha dla subversion.
%package -n python-subversion
Summary: Subversion python bindings
-Summary(pl): Dowi±zania do subversion dla pythona
-Summary(pt_BR): Módulos python para acessar os recursos do Subversion
+Summary(pl.UTF-8): Dowiązania do subversion dla pythona
+Summary(pt_BR.UTF-8): Módulos python para acessar os recursos do Subversion
Group: Development/Languages/Python
%pyrequires_eq python
Requires: %{name}-libs = %{version}-%{release}
%description -n python-subversion
Subversion python bindings.
-%description -n python-subversion -l pl
-Dowi±zania do subversion dla pythona.
+%description -n python-subversion -l pl.UTF-8
+Dowiązania do subversion dla pythona.
-%description -n python-subversion -l pt_BR
-Módulos python para acessar os recursos do Subversion.
+%description -n python-subversion -l pt_BR.UTF-8
+Módulos python para acessar os recursos do Subversion.
%package -n perl-subversion
Summary: Subversion perl bindings
-Summary(pl): Dowi±zania do subversion dla perla
-Summary(pt_BR): Módulos perl para acessar os recursos do Subversion
+Summary(pl.UTF-8): Dowiązania do subversion dla perla
+Summary(pt_BR.UTF-8): Módulos perl para acessar os recursos do Subversion
Group: Development/Languages/Perl
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: subversion-perl
%description -n perl-subversion
Subversion perl bindings.
-%description -n perl-subversion -l pl
-Dowi±zania do subversion dla perl.
+%description -n perl-subversion -l pl.UTF-8
+Dowiązania do subversion dla perl.
-%description -n perl-subversion -l pt_BR
-Módulos perl para acessar os recursos do Subversion.
+%description -n perl-subversion -l pt_BR.UTF-8
+Módulos perl para acessar os recursos do Subversion.
%package -n apache-mod_dav_svn
Summary: Apache module: Subversion Server
-Summary(pl): Modu³ apache: Serwer Subversion
+Summary(pl.UTF-8): Moduł apache: Serwer Subversion
Group: Networking/Daemons
Requires: %{name} = %{version}-%{release}
Requires: apache(modules-api) = %apache_modules_api
%description -n apache-mod_dav_svn
Apache module: Subversion Server.
-%description -n apache-mod_dav_svn -l pl
-Modu³ apache: Serwer Subversion.
+%description -n apache-mod_dav_svn -l pl.UTF-8
+Moduł apache: Serwer Subversion.
%package -n apache-mod_authz_svn
Summary: Apache module: Subversion Server - path-based authorization
-Summary(pl): Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion
+Summary(pl.UTF-8): Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion
Group: Networking/Daemons
Requires: apache(modules-api) = %apache_modules_api
Requires: apache-mod_dav_svn = %{version}-%{release}
%description -n apache-mod_authz_svn
Apache module: Subversion Server - path-based authorization.
-%description -n apache-mod_authz_svn -l pl
-Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion.
+%description -n apache-mod_authz_svn -l pl.UTF-8
+Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
+rm subversion/bindings/swig/proxy/*.swg
+cd subversion/bindings/swig && python "%{SOURCE5}" && cd ../../..
cp -f /usr/share/automake/config.sub ac-helpers
chmod +x ./autogen.sh && ./autogen.sh
--without-apxs \
--with-berkeley-db=%{_includedir}/db4:%{_libdir} \
%endif
-%if %{without python} && %{without perl}
+%if !%{with python} && !%{with perl}
--without-swig \
%endif
%endif
%{__make} -j1
-%if %{without net_client_only}
+%if !%{with net_client_only}
# python
%if %{with python}
%{__make} swig-py \
$RPM_BUILD_ROOT/home/services/subversion{,/repos}
%{__make} install -j1 \
-%if %{without net_client_only} && %{with python}
+%if !%{with net_client_only} && %{with python}
install-swig-py \
%endif
APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
swig_pydir=%{py_sitedir}/libsvn \
swig_pydir_extra=%{py_sitedir}/svn
-%if %{without net_client_only} && %{with perl}
+%if !%{with net_client_only} && %{with perl}
%{__make} install-swig-pl-lib \
DESTDIR=$RPM_BUILD_ROOT
odir=$(pwd)
install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
%endif
-%if %{without net_client_only}
+%if !%{with net_client_only}
install tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
%if %{with python}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%find_lang %{name}
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*swig*.la
+
%clean
rm -rf $RPM_BUILD_ROOT
%doc tools/xslt/*
%attr(755,root,root) %{_bindir}/svn*
%exclude %{_bindir}/svnserve
-%if %{without net_client_only}
+%if !%{with net_client_only}
%exclude %{_bindir}/svn-hot-backup
%endif
%{_mandir}/man1/*
%{_libdir}/lib*.la
%if %{with perl} || %{with python}
%exclude %{_libdir}/lib*_swig_*.so
-%exclude %{_libdir}/lib*swig*.la
%endif
%{_examplesdir}/%{name}-%{version}
%defattr(644,root,root,755)
%{_libdir}/lib*.a
-%if %{without net_client_only}
+%if !%{with net_client_only}
%files svnserve
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/svnserve
%attr(755,root,root) %{py_sitedir}/libsvn/*.so
%{_examplesdir}/python-%{name}-%{version}
%attr(755,root,root) %{_libdir}/lib*_swig_py*.so*
-%{_libdir}/lib*_swig_py*.la
%endif
%if %{with perl}
%{perl_vendorarch}/auto/SVN/*/*.bs
%{_mandir}/man3/*.3pm*
%attr(755,root,root) %{_libdir}/lib*_swig_perl*.so*
-%{_libdir}/lib*_swig_perl*.la
%endif
%if %{with apache}