SPECS: subversion.spec - cosmetics on bconds - define pdir/pnam fo...

[glen]

Author: glen                         Date: Tue Jul 18 07:47:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics on bconds
- define pdir/pnam for perlautoclean automatics
- limit jobservers to one ((build) commands executed in wrong order)

---- Files affected:
SPECS:
   subversion.spec (1.166 -> 1.167) 

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.166 SPECS/subversion.spec:1.167
--- SPECS/subversion.spec:1.166	Fri Jul  7 11:13:18 2006
+++ SPECS/subversion.spec	Tue Jul 18 09:47:32 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
-#
-# todo:
+# TODO:
 # - remove net_client_only and add db bcond (then without apache and
 #   without db => net_client_only - spec will be more simpler, I think)
 #
@@ -12,6 +11,8 @@
 #
 %{!?with_net_client_only:%include	/usr/lib/rpm/macros.perl}
 %define	apxs	/usr/sbin/apxs
+%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
@@ -296,7 +297,7 @@
 	--without-apxs \
 	--with-berkeley-db=%{_includedir}/db4:%{_libdir} \
 %endif
-%if !%{with python} && !%{with perl}
+%if %{without python} && %{without perl}
 	--without-swig \
 %endif
 %endif
@@ -305,9 +306,9 @@
 	--with-apr=%{_bindir}/apr-1-config \
 	--with-apr-util=%{_bindir}/apu-1-config
 
-%{__make}
+%{__make} -j1
 
-%if !%{with net_client_only}
+%if %{without net_client_only}
 # python
 %if %{with python}
 %{__make} swig-py \
@@ -334,8 +335,8 @@
 	$RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}} \
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
-%{__make} install \
-%if !%{with net_client_only} && %{with python}
+%{__make} install -j1 \
+%if %{without net_client_only} && %{with python}
 	install-swig-py \
 %endif
 	APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
@@ -343,7 +344,7 @@
 	swig_pydir=%{py_sitedir}/libsvn \
 	swig_pydir_extra=%{py_sitedir}/svn
 
-%if !%{with net_client_only} && %{with perl}
+%if %{without net_client_only} && %{with perl}
 %{__make} install-swig-pl-lib \
 	DESTDIR=$RPM_BUILD_ROOT
 odir=$(pwd)
@@ -364,7 +365,7 @@
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
 %endif
 
-%if !%{with net_client_only}
+%if %{without 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}
@@ -520,6 +521,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167  2006/07/18 07:47:32  glen
+- cosmetics on bconds
+- define pdir/pnam for perlautoclean automatics
+- limit jobservers to one ((build) commands executed in wrong order)
+
 Revision 1.166  2006/07/07 09:13:18  qboosh
 - svn-hot-backup if !with_net_client_only
 
@@ -540,8 +546,8 @@
 
 Revision 1.160  2006/03/18 12:55:04  wolf
 - block building with neon >= 0.25.5
-checking neon library version... 0.26.0
-You have neon version 0.26.0, but Subversion needs neon 0.25.4.
+  checking neon library version... 0.26.0
+  You have neon version 0.26.0, but Subversion needs neon 0.25.4.
 
 Revision 1.159  2006/03/18 12:48:23  wolf
 - cut changelog
================================================================

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