]> git.pld-linux.org Git - packages/subversion.git/commitdiff
- fix build without apache
authorElan Ruusamäe <glen@pld-linux.org>
Sun, 13 Mar 2011 15:39:50 +0000 (15:39 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    subversion.spec -> 1.306

subversion.spec

index 9faa9d565b8e9dfef37839f904a675d854744f7a..4f00c1f14fb34d65b63f03fd15d9bca5b36fff9b 100644 (file)
@@ -447,7 +447,6 @@ chmod +x ./autogen.sh && ./autogen.sh
 %if %{with apache}
        --with-apxs=%{_sbindir}/apxs \
 %else
-       --without-apache \
        --without-apxs \
 %endif
 %if %{without swig}
@@ -576,7 +575,9 @@ install -p tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
 %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}
@@ -807,6 +808,8 @@ fi
 %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)
@@ -885,5 +888,3 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_authz_svn.conf
 %attr(755,root,root) %{apachelibdir}/mod_authz_svn.so
 %endif
-
-%endif # net_client_only
This page took 0.048156 seconds and 4 git commands to generate.