SPECS: subversion.spec - rebuild with new apache - sort BR/R - rel 2

Thu Dec 22 00:18:58 CET 2005

Author: glen                         Date: Wed Dec 21 23:18:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rebuild with new apache
- sort BR/R
- rel 2

---- Files affected:
SPECS:
   subversion.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.148 SPECS/subversion.spec:1.149

--- SPECS/subversion.spec:1.148	Tue Oct 11 21:40:25 2005
+++ SPECS/subversion.spec	Thu Dec 22 00:18:53 2005
@@ -10,14 +10,14 @@
 %bcond_without	python				# build without python bindings
 %bcond_without	perl				# build without perl bindings
 %bcond_without	apache				# build without apache support (webdav, etc)
-#	
+#
 %{!?with_net_client_only:%include	/usr/lib/rpm/macros.perl}
 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:	1.2.3
-Release:	1
+Release:	2
 License:	Apache/BSD Style
 Group:		Development/Version Control
 Source0:	http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2
@@ -32,8 +32,8 @@
 %if %{with net_client_only}
 %global apache_modules_api 0
 %else
-BuildRequires:	automake
 %{?with_apache:BuildRequires:	apache-devel >= 2.0.47-0.6}
+BuildRequires:	automake
 BuildRequires:	db-devel >= 4.1.25
 BuildRequires:	rpmbuild(macros) >= 1.120
 %if %{with perl}
@@ -50,13 +50,13 @@
 BuildRequires:	gettext-devel
 BuildRequires:	libtool >= 1.4-9
 %if %{without internal_neon}
-BuildRequires:	neon-devel >= 0.24.7
 BuildRequires:	neon-devel < 0.25.0
+BuildRequires:	neon-devel >= 0.24.7
 %endif
 %if %{with python}
-BuildRequires:	python >= 2.2
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	python-modules >= 2.2
+BuildRequires:	python >= 2.2
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python >= 1.3.24
 %endif
@@ -164,9 +164,9 @@
 Summary:	Subversion svnserve
 Summary(pl):	Subversion svnserve
 Group:		Networking/Daemons
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	rc-scripts
 
 %description svnserve
 Subversion svnserve server.
@@ -180,9 +180,9 @@
 Summary(pt_BR):	Módulos python para acessar os recursos do Subversion
 Group:		Applications
 %pyrequires_eq	python
+Requires:	%{name} = %{version}-%{release}
 Requires:	python-rcsparse >= 0.1-0.20031026.0
 Requires:	python-subversion = %{version}
-Requires:	%{name} = %{version}-%{release}
 
 %description tools
 Subversion tools and scripts.
@@ -194,8 +194,8 @@
 Summary:	bash completion for subversion
 Summary(pl):	Dopełnienia basha dla subversion
 Group:		Applications/Shells
-Requires:	bash-completion
 Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion
 Conflicts:	%{name}-tools <= 1.1.0-0.rc2.1
 
 %description -n bash-completion-subversion
@@ -243,10 +243,10 @@
 Summary:	Apache module: Subversion Server
 Summary(pl):	Moduł apache: Serwer Subversion
 Group:		Networking/Daemons
-Requires:	apache >= 2.0.47
+Requires:	%{name} = %{version}-%{release}
 Requires:	apache(modules-api) = %{apache_modules_api}
 Requires:	apache-mod_dav
-Requires:	%{name} = %{version}-%{release}
+Requires:	apache >= 2.0.47
 
 %description -n apache-mod_dav_svn
 Apache module: Subversion Server.
@@ -258,9 +258,9 @@
 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(modules-api) = %{apache_modules_api}
 Requires:	apache-mod_dav_svn = %{version}-%{release}
 Requires:	apache >= 2.0.47
-Requires:	apache(modules-api) = %{apache_modules_api}
 
 %description -n apache-mod_authz_svn
 Apache module: Subversion Server - path-based authorization.
@@ -459,7 +459,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%if !%{with net_client_only}
+%if %{without net_client_only}
 %files svnserve
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/svnserve
@@ -516,7 +516,8 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/*_mod_authz_svn.conf
 %attr(755,root,root) %{_apachelibdir}/mod_authz_svn.so
 %endif
-%endif
+
+%endif # net_client_only
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -524,6 +525,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2005/12/21 23:18:53  glen
+- rebuild with new apache
+- sort BR/R
+- rel 2
+
 Revision 1.148  2005/10/11 19:40:25  qboosh
 - removed svn-config duplicate from base
 
@@ -633,7 +639,7 @@
 - fix Changelog (by users not for).
 
 Revision 1.114  2004/08/19 18:24:38  twittner
-- bash-completion-subversion subpackage released from -utils (requsted by 
+- bash-completion-subversion subpackage released from -utils (requsted by
   many zsh users).
 - rel .2
 
@@ -641,7 +647,7 @@
 - 1.1.0rc2
 
 Revision 1.112  2004/07/28 08:03:20  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.111  2004/07/15 19:42:03  arekm
 - old way of a hack
@@ -831,7 +837,8 @@
 - rel 0.2
 
 Revision 1.53  2003/09/13 16:42:58  arekm
-- net_client_only bcond (allows to build networked client without need to have apache2-devel nor db4-devel nor swig3-devel)
+- net_client_only bcond (allows to build networked client without need
+  to have apache2-devel nor db4-devel nor swig3-devel)
 
 Revision 1.52  2003/09/13 13:20:34  arekm
 - update BR for new apache/apr
@@ -846,7 +853,7 @@
 - updated to 0.28
 - added --with internal_neon bcond
 - fixed BR: neon-devel
-WARNING: this version requires dump/load cycle from pre 0.28 repos
+  WARNING: this version requires dump/load cycle from pre 0.28 repos
 
 Revision 1.48  2003/08/23 11:53:33  malekith
 - builds fine; rel 0.2
@@ -871,8 +878,8 @@
 - no builds without problems,
 
 Revision 1.41  2003/07/17 09:39:59  wiget
-- remove internal version of %%requires_eq_to (not used now)
-- use %%{apache_modules_api} in Requires (to prevent rebuilding subversion on
+- remove internal version of %requires_eq_to (not used now)
+- use %{apache_modules_api} in Requires (to prevent rebuilding subversion on
   apache version change but without modules API change)
 - BR apache-devel with fixed libtool (relink issue)
 - remove relink workaround
@@ -942,7 +949,8 @@
 - up to 0.19.1
 
 Revision 1.21  2003/02/26 12:41:36  wiget
-- define %%requires_eq_to and use it (fix problem with requires generation if apache-mod_dav is not installed)
+- define %requires_eq_to and use it (fix problem with requires
+  generation if apache-mod_dav is not installed)
 - rel .1
 
 Revision 1.20  2003/02/25 12:10:49  malekith
@@ -995,7 +1003,7 @@
 - fix make install with swig
 
 Revision 1.5  2002/04/11 16:47:26  misiek
-apr tools are in bindir now
+- apr tools are in bindir now
 
 Revision 1.4  2002/04/11 16:41:47  misiek
 - migrate to new style apache configuration
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.148&r2=1.149&f=u

