- updated to 1.0.0

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 384cf397af2d69e0c33b49c0e9d5e24b5b333ec0..d327986a726deff9de926771ddb7f6acc3d73c08 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,28 +9,29 @@ 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.35.0
-Release:       1
+Version:       1.0.0
+Release:       0
 License:       Apache/BSD Style
 Group:         Development/Version Control
-Source0:       http://svn.collab.net/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: affeeda0a20d61a11fce2b1e19651062
+Source0:       http://svn.collab.net/tarballs/%{name}-%{version}.tar.bz2
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
 Source4:       %{name}-svnserve.sysconfig
-Patch0:                %{name}-svnlook.patch
-Patch1:                %{name}-bindings.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
+BuildRequires: automake
 BuildRequires: apache-devel >= 2.0.47-0.6
 BuildRequires: db-devel >= 4.1.25
 BuildRequires: rpmbuild(macros) >= 1.120
-BuildRequires: swig >= 1.3.17
-BuildRequires: swig-python >= 1.3.17
-BuildRequires: swig-perl >= 1.3.17
+BuildRequires: swig >= 1.3.19
+BuildRequires: swig-python >= 1.3.19
+BuildRequires: swig-perl >= 1.3.19
 BuildRequires: perl-devel >= 5.8.0
 BuildRequires: rpm-perlprov
 %endif
@@ -51,7 +49,7 @@ BuildRequires:        rpm-pythonprov >= 4.0.2-50
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _apachelibdir   /usr/lib/apache
+%define                _apachelibdir   /usr/%{_lib}/apache
 %define                _libexecdir     %{_libdir}/svn
 
 %description
@@ -113,7 +111,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
@@ -149,6 +147,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.
@@ -164,6 +163,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.
@@ -178,6 +178,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.
@@ -194,6 +195,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.
@@ -211,6 +213,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.
@@ -222,7 +225,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}
 
@@ -234,10 +237,11 @@ Modu
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+#%patch0 -p0
+#%patch1 -p1
 
 %build
+cp -f /usr/share/automake/config.sub ac-helpers
 chmod +x ./autogen.sh && ./autogen.sh
 
 # don't enable dso - currently it's broken
@@ -292,8 +296,9 @@ cp -f doc/book/book/images/*.png svn-handbook/images/
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir},%{_infodir}}
+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}}
 
 %{__make} install \
        LC_ALL=C \
@@ -320,11 +325,18 @@ install doc/programmer/design/*.info* $RPM_BUILD_ROOT%{_infodir}/
 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}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
+find $RPM_BUILD_ROOT%{py_sitedir} -name "*.py" -o -name "*.a" -o -name "*.la" | xargs rm -f
+install tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
 %endif
 
+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
 
@@ -371,8 +383,10 @@ fi
 %doc svn-handbook doc/book/misc-docs/misc-docs.html
 %doc tools/hook-scripts/*.{pl,py,example}
 %doc tools/hook-scripts/mailer/*.{py,example}
+%doc tools/xslt/*
 %attr(755,root,root) %{_bindir}/svn*
 %exclude %{_bindir}/svnserve
+%exclude %{_bindir}/svn-hot-backup
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -389,6 +403,7 @@ fi
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_infodir}/svn*
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
@@ -406,6 +421,8 @@ fi
 %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
@@ -416,6 +433,7 @@ fi
 %{py_sitedir}/svn/*.py[co]
 %{py_sitedir}/libsvn/*.py[co]
 %attr(755,root,root) %{py_sitedir}/libsvn/*.so
+%{_examplesdir}/python-%{name}-%{version}
 
 %files -n perl-subversion
 %defattr(644,root,root,755)