SPECS (AC-branch): subversion.spec - merged changes from HEAD (mos...
glen
glen at pld-linux.org
Tue Sep 12 08:37:53 CEST 2006
Author: glen Date: Tue Sep 12 06:37:53 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged changes from HEAD (most important is apache module deps)
---- Files affected:
SPECS:
subversion.spec (1.153.2.2 -> 1.153.2.3)
---- Diffs:
================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.153.2.2 SPECS/subversion.spec:1.153.2.3
--- SPECS/subversion.spec:1.153.2.2 Tue Sep 12 08:06:38 2006
+++ SPECS/subversion.spec Tue Sep 12 08:37:48 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)
#
@@ -11,12 +10,15 @@
%bcond_without apache # build without apache support (webdav, etc)
#
%{!?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
Name: subversion
Version: 1.4.0
-Release: 1
+Release: 2
License: Apache/BSD Style
Group: Development/Version Control
Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz
@@ -34,7 +36,7 @@
%{?with_apache:BuildRequires: apache-devel >= 2.2.0-8}
BuildRequires: automake
BuildRequires: db-devel >= 4.1.25
-BuildRequires: rpmbuild(macros) >= 1.120
+BuildRequires: rpmbuild(macros) >= 1.268
%if %{with perl}
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
@@ -61,8 +63,8 @@
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _apachelibdir /usr/%{_lib}/apache
-%define _libexecdir %{_libdir}/svn
+%define _apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _libexecdir %{_libdir}/svn
%description
The goal of the Subversion project is to build a version control
@@ -240,8 +242,7 @@
Summary(pl): Moduł apache: Serwer Subversion
Group: Networking/Daemons
Requires: %{name} = %{version}-%{release}
-Requires: apache >= 2.0.47
-Requires: apache(modules-api) = %{apache_modules_api}
+Requires: apache(modules-api) = %apache_modules_api
Requires: apache-mod_dav
%description -n apache-mod_dav_svn
@@ -254,8 +255,7 @@
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 >= 2.0.47
-Requires: apache(modules-api) = %{apache_modules_api}
+Requires: apache(modules-api) = %apache_modules_api
Requires: apache-mod_dav_svn = %{version}-%{release}
%description -n apache-mod_authz_svn
@@ -295,7 +295,7 @@
--without-apxs \
--with-berkeley-db=%{_includedir}/db4:%{_libdir} \
%endif
-%if !%{with python} && !%{with perl}
+%if %{without python} && %{without perl}
--without-swig \
%endif
%endif
@@ -303,9 +303,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 \
@@ -330,8 +330,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)" \
@@ -339,7 +339,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)
@@ -358,7 +358,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}
@@ -388,31 +388,21 @@
%postun -n perl-subversion -p /sbin/ldconfig
%post svnserve
-if [ -f /var/lock/subsys/svnserve ]; then
- /etc/rc.d/init.d/svnserve restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/svnserve start\" to start subversion svnserve daemon."
-fi
+/sbin/chkconfig --add svnserve
+%service svnserve restart "svnserve daemon"
+
%preun svnserve
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/svnserve ]; then
- /etc/rc.d/init.d/svnserve restart 1>&2
- fi
+ %service svnserve stop
+ /sbin/chkconfig --del svnserve
fi
-
%post -n apache-mod_dav_svn
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
-fi
+%service -q httpd restart
%preun -n apache-mod_dav_svn
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+ %service -q httpd restart
fi
%files
@@ -424,7 +414,9 @@
%doc tools/xslt/*
%attr(755,root,root) %{_bindir}/svn*
%exclude %{_bindir}/svnserve
+%if %{without net_client_only}
%exclude %{_bindir}/svn-hot-backup
+%endif
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man8/*
@@ -442,6 +434,10 @@
%{_includedir}/%{name}*
%attr(755,root,root) %{_libdir}/lib*.so
%{_libdir}/lib*.la
+%if %{with perl} || %{with python}
+%exclude %{_libdir}/lib*_swig_*.so
+%exclude %{_libdir}/lib*swig*.la
+%endif
%{_examplesdir}/%{name}-%{version}
%files static
@@ -478,7 +474,8 @@
%{py_sitedir}/libsvn/*.py[co]
%attr(755,root,root) %{py_sitedir}/libsvn/*.so
%{_examplesdir}/python-%{name}-%{version}
-%attr(755,root,root) %{_libdir}/lib*_swig_py*.so.*
+%attr(755,root,root) %{_libdir}/lib*_swig_py*.so*
+%{_libdir}/lib*_swig_py*.la
%endif
%if %{with perl}
@@ -490,7 +487,8 @@
%attr(755,root,root) %{perl_vendorarch}/auto/SVN/*/*.so
%{perl_vendorarch}/auto/SVN/*/*.bs
%{_mandir}/man3/*.3pm*
-%attr(755,root,root) %{_libdir}/lib*_swig_perl*.so.*
+%attr(755,root,root) %{_libdir}/lib*_swig_perl*.so*
+%{_libdir}/lib*_swig_perl*.la
%endif
%if %{with apache}
@@ -514,6 +512,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.153.2.3 2006/09/12 06:37:48 glen
+- merged changes from HEAD (most important is apache module deps)
+
Revision 1.153.2.2 2006/09/12 06:06:38 glen
- adapter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.153.2.2&r2=1.153.2.3&f=u
More information about the pld-cvs-commit
mailing list