Yes, thanks, I've incorporated these changes into the rev 4204.
- David
On Mon, 16 Dec 2002, Brandon Ehle wrote:
> David, shouldn't the spec files for the RPMs look like this?
>
>
> Index: rpm/redhat-7.x/subversion.spec
> ===================================================================
> --- rpm/redhat-7.x/subversion.spec (revision 4134)
> +++ rpm/redhat-7.x/subversion.spec (working copy)
> @@ -222,8 +222,7 @@
>
> %if %{build_cvs2svn}
> # Build cvs2svn python bindings
> -cd subversion/bindings/swig/python
> -/usr/bin/python2 setup.py build
> +make swig-py-ext
> %endif
>
> %install
> @@ -238,17 +237,12 @@
> infodir=$RPM_BUILD_ROOT/usr/share/info \
> libexecdir=$RPM_BUILD_ROOT/%{apache_dir}/lib
>
> -%if %{build_cvs2svn}
> -make install-swig-py-ext DISTUTIL_PARAM=--prefix=$RPM_BUILD_ROOT/usr
> -%endif
> -
> # Add subversion.conf configuration file into httpd.conf directory.
> cp %{SOURCE1} $RPM_BUILD_ROOT/%{apache_dir}/conf
>
> %if %{build_cvs2svn}
> # Install cvs2svn and supporting files
> -cd subversion/bindings/swig/python
> -/usr/bin/python2 setup.py install --prefix $RPM_BUILD_ROOT/usr
> +make install-swig-py-ext DISTUTIL_PARAM=--prefix=$RPM_BUILD_ROOT/usr
> sed -e 's;#!/usr/bin/env python;#!/usr/bin/env python2;' < $RPM_BUILD_DIR/%{name}-%{version}/tools/cvs2svn/cvs2svn.py > $RPM_BUILD_ROOT/usr/bin/cvs2svn
> chmod a+x $RPM_BUILD_ROOT/usr/bin/cvs2svn
> cp %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/python2.2/site-packages
> Index: rpm/redhat-8.x/subversion.spec
> ===================================================================
> --- rpm/redhat-8.x/subversion.spec (revision 4134)
> +++ rpm/redhat-8.x/subversion.spec (working copy)
> @@ -219,8 +219,7 @@
>
> %if %{build_cvs2svn}
> # Build cvs2svn python bindings
> -cd subversion/bindings/swig/python
> -/usr/bin/python2 setup.py build
> +make swig-py-ext
> %endif
>
> %install
> @@ -235,18 +234,13 @@
> infodir=$RPM_BUILD_ROOT/usr/share/info \
> libexecdir=$RPM_BUILD_ROOT/%{apache_dir}/lib
>
> -%if %{build_cvs2svn}
> -make install-swig-py-ext DISTUTIL_PARAM=--prefix=$RPM_BUILD_ROOT/usr
> -%endif
> -
> # Add subversion.conf configuration file into httpd/conf.d directory.
> mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
> cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d
>
> %if %{build_cvs2svn}
> # Install cvs2svn and supporting files
> -cd subversion/bindings/swig/python
> -/usr/bin/python2 setup.py install --prefix $RPM_BUILD_ROOT/usr
> +make install-swig-py-ext DISTUTIL_PARAM=--prefix=$RPM_BUILD_ROOT/usr
> sed -e 's;#!/usr/bin/env python;#!/usr/bin/env python2;' < $RPM_BUILD_DIR/%{name}-%{version}/tools/cvs2svn/cvs2svn.py > $RPM_BUILD_ROOT/usr/bin/cvs2svn
> chmod a+x $RPM_BUILD_ROOT/usr/bin/cvs2svn
> cp %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/python2.2/site-packages
>
>
>
>
--
David Wayne Summers "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint = C0 E0 4F 50 DD A9 B6 2B 60 A1 31 7E D2 28 6D A8
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 30 00:23:54 2002