packages: subversion/subversion.spec - fix build without apache

glen glen at pld-linux.org
Sun Mar 13 16:39:56 CET 2011


Author: glen                         Date: Sun Mar 13 15:39:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build without apache

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

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.305 packages/subversion/subversion.spec:1.306
--- packages/subversion/subversion.spec:1.305	Sun Mar 13 16:34:07 2011
+++ packages/subversion/subversion.spec	Sun Mar 13 16:39:50 2011
@@ -448,7 +448,6 @@
 %if %{with apache}
 	--with-apxs=%{_sbindir}/apxs \
 %else
-	--without-apache \
 	--without-apxs \
 %endif
 %if %{without swig}
@@ -577,7 +576,9 @@
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.la
-install tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
+# .a created on ac only
+%{__rm} -f $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.a
+cp -p tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
 %endif
 
 cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
@@ -808,6 +809,8 @@
 %defattr(644,root,root,755)
 /etc/bash_completion.d/%{name}
 
+%endif # net_client_only
+
 %if %{with javahl}
 %files -n java-subversion
 %defattr(644,root,root,755)
@@ -887,14 +890,15 @@
 %attr(755,root,root) %{apachelibdir}/mod_authz_svn.so
 %endif
 
-%endif # net_client_only
-
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2011/03/13 15:39:50  glen
+- fix build without apache
+
 Revision 1.305  2011/03/13 15:34:07  glen
 - no duplicate packaging of python tools/examples
 
================================================================

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



More information about the pld-cvs-commit mailing list