packages: subversion/subversion.spec - try to improve spec readability with...

[glen]

Author: glen                         Date: Sun Mar 13 16:25:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- try to improve spec readability with bconds

---- Files affected:
packages/subversion:
   subversion.spec (1.306 -> 1.307) 

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.306 packages/subversion/subversion.spec:1.307
--- packages/subversion/subversion.spec:1.306	Sun Mar 13 16:39:50 2011
+++ packages/subversion/subversion.spec	Sun Mar 13 17:24:59 2011
@@ -456,10 +456,16 @@
 %if %{without ruby}
 	ac_cv_path_RUBY=none \
 %endif
-	%{?with_csvn:--with-ctypesgen=%{_bindir}/ctypesgen.py} \
-	--%{?with_javahl:en}%{!?with_javahl:dis}able-javahl \
+%if %{with csvn}
+	--with-ctypesgen=%{_bindir}/ctypesgen.py \
+%endif
+%if %{with javahl}
+	--enable-javahl \
 	--with-jdk="%{java_home}" \
 	--without-jikes \
+%else
+	--disable-javahl \
+%endif
 %if %{with neon}
 	--without-serf \
 	--with-neon=%{_prefix} \
@@ -479,25 +485,23 @@
 
 %{__make} -j1
 
-# python
-%if %{with python}
 %if %{with csvn}
-# ctypes bindings
+# Python ctypes bindings
 %{__make} ctypes-python
 %endif
-# swig bindings
+%if %{with python}
+# Python swig bindings
 %{__make} swig-py \
 	swig_pydir=%{py_sitedir}/libsvn \
 	swig_pydir_extra=%{py_sitedir}/svn
 %endif
-# perl
 %if %{with perl}
+# Perl swig bindings
 %{__make} -j1 swig-pl-lib
-odir=$(pwd)
 cd subversion/bindings/swig/perl/native
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 %{__make} -j1
-cd $odir
+cd -
 %endif
 %if %{with javahl}
 %{__make} -j1 javahl \
@@ -510,10 +514,10 @@
 
 %if %{with tests}
 %{__make} check
-%if %{with python}
 %if %{with csvn}
 %{__make} check-ctypes-python
 %endif
+%if %{with python}
 %{__make} check-swig-py
 %endif
 %if %{with perl}
@@ -534,23 +538,23 @@
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
 %{__make} install -j1 \
+	DESTDIR=$RPM_BUILD_ROOT \
+	APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
 %if %{with javahl}
 	install-javahl \
 	javahl_javadir="%{_javadir}" \
 %endif
 %if %{with python}
 	install-swig-py \
+	swig_pydir=%{py_sitedir}/libsvn \
+	swig_pydir_extra=%{py_sitedir}/svn
+%endif
 %if %{with csvn}
 	install-ctypes-python \
 %endif
-%endif
 %if %{with ruby}
 	install-swig-rb install-swig-rb-doc \
 %endif
-	APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
-	DESTDIR=$RPM_BUILD_ROOT \
-	swig_pydir=%{py_sitedir}/libsvn \
-	swig_pydir_extra=%{py_sitedir}/svn
 
 %if %{with perl}
 %{__make} install-swig-pl-lib \
@@ -584,7 +588,9 @@
 cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
 cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{?with_javahl:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}}
+%if %{with javahl}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}
+%endif
 %if %{with swig}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
 %if %{with ruby}
@@ -833,6 +839,7 @@
 %dir %{py_sitedir}/svn
 %{py_sitedir}/svn/*.py[co]
 %{_examplesdir}/python-%{name}-%{version}
+%endif
 
 %if %{with csvn}
 %files -n python-csvn
@@ -847,7 +854,6 @@
 %{py_sitescriptdir}/csvn/ext/*.py[co]
 %{py_sitescriptdir}/svn_ctypes_python_bindings-0.1-py*.egg-info
 %endif
-%endif
 
 %if %{with perl}
 %files -n perl-subversion
@@ -896,6 +902,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.307  2011/03/13 16:24:59  glen
+- try to improve spec readability with bconds
+
 Revision 1.306  2011/03/13 15:39:50  glen
 - fix build without apache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.306&r2=1.307&f=u