- updated to 1.0.1

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 0ccf0ca0ece6621e57b0a0c469a5e8d38142a522..af9e13c54beeafb4bc94d980ad6895db550cc601 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,7 +1,4 @@
 #
-# TODO:
-# - separate subpackage with svnserve + init.d script + sysconfig file
-#
 # Conditional build:
 %bcond_with    internal_neon           # build with internal neon
 %bcond_with    net_client_only         # build only net client
@@ -12,19 +9,20 @@ 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
 Name:          subversion
-Version:       0.37.0
+Version:       1.0.1
 Release:       1
 License:       Apache/BSD Style
 Group:         Development/Version Control
-Source0:       http://svn.collab.net/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: 048c4d17d5880dc8f3699020eac56224
+Source0:       http://svn.collab.net/tarballs/%{name}-%{version}.tar.bz2
+# Source0-md5: 50ca608d260b76d99ed85909acb7ae92
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
 Source4:       %{name}-svnserve.sysconfig
-Patch0:                %{name}-svnlook.patch
-Patch1:                %{name}-hot_backup_num.patch
+#Patch0:               %{name}-svnlook.patch
+#Patch1:               %{name}-hot_backup_num.patch
 URL:           http://subversion.tigris.org/
+Requires:      %{name}-libs = %{version}-%{release}
 %if %{with net_client_only}
 %global apache_modules_api 0
 %else
@@ -47,7 +45,7 @@ BuildRequires:        expat-devel
 BuildRequires: libtool >= 1.4-9
 BuildRequires: libxslt-progs
 %{!?with_internal_neon:BuildRequires:  neon-devel >= 0.24.1}
-BuildRequires: python >= 2.2
+BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-pythonprov >= 4.0.2-50
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -114,7 +112,7 @@ 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
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     libsubversion0-devel
 
 %description devel
@@ -150,6 +148,7 @@ Summary(pl):        Subversion svnserve
 Group:         Networking/Daemons
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name} = %{version}-%{release}
 
 %description svnserve
 Subversion svnserve server.
@@ -165,6 +164,7 @@ Group:              Applications
 %pyrequires_eq python
 Requires:      python-rcsparse >= 0.1-0.20031026.0
 Requires:      python-subversion = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description tools
 Subversion tools and scripts.
@@ -179,6 +179,7 @@ Summary(pt_BR):     M
 Group:         Development/Languages/Python
 %pyrequires_eq python
 Obsoletes:     subversion-python
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description -n python-subversion
 Subversion python bindings.
@@ -195,6 +196,7 @@ Summary(pl):        Dowi
 Summary(pt_BR):        Módulos perl para acessar os recursos do Subversion
 Group:         Development/Languages/Perl
 Obsoletes:     subversion-perl
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description -n perl-subversion
 Subversion perl bindings.
@@ -212,6 +214,7 @@ Group:              Networking/Daemons
 Requires:      apache >= 2.0.47
 Requires:      apache(modules-api) = %{apache_modules_api}
 Requires:      apache-mod_dav
+Requires:      %{name} = %{version}-%{release}
 
 %description -n apache-mod_dav_svn
 Apache module: Subversion Server.
@@ -223,7 +226,7 @@ Modu
 Summary:       Apache module: Subversion Server - path-based authorization
 Summary(pl):   Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion
 Group:         Networking/Daemons
-Requires:      apache-mod_dav_svn = %{version}
+Requires:      apache-mod_dav_svn = %{version}-%{release}
 Requires:      apache >= 2.0.47
 Requires:      apache(modules-api) = %{apache_modules_api}
 
@@ -235,8 +238,8 @@ Modu
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+#%patch0 -p0
+#%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub ac-helpers
@@ -296,7 +299,7 @@ cp -f doc/book/book/images/*.png svn-handbook/images/
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir},%{_infodir}} \
-       $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version}/auth_provider,python-%{name}-%{version}}
+       $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}}
 
 %{__make} install \
        LC_ALL=C \
@@ -320,9 +323,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
 install doc/programmer/design/*.info* $RPM_BUILD_ROOT%{_infodir}/
 
 %if ! %{with net_client_only}
-install tools/cvs2svn/cvs2svn.py       $RPM_BUILD_ROOT%{_bindir}/cvs2svn
-install tools/cvs2svn/cvs2svn.1                $RPM_BUILD_ROOT%{_mandir}/man1
-cp tools/cvs2svn/README tools/cvs2svn/README.cvs2svn
 install tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -333,7 +333,6 @@ install tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{vers
 
 install tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
 install tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install tools/examples/auth_provider/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/auth_provider
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -384,6 +383,7 @@ fi
 %doc tools/xslt/*
 %attr(755,root,root) %{_bindir}/svn*
 %exclude %{_bindir}/svnserve
+%exclude %{_bindir}/svn-hot-backup
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -416,11 +416,8 @@ fi
 
 %files tools
 %defattr(644,root,root,755)
-%doc tools/cvs2svn/README*
-%attr(755,root,root) %{_bindir}/cvs*
 %attr(755,root,root) %{_bindir}/svn-hot-backup
 /etc/bash_completion.d/%{name}
-%{_mandir}/man1/cvs*
 
 %files -n python-subversion
 %defattr(644,root,root,755)