[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RedHat 7 & 8 spec files

From: Brandon Ehle <behle_at_pipedreaminteractive.com>
Date: 2002-12-16 17:31:22 CET

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 16 17:39:44 2002

This is an archived mail posted to the Subversion Dev mailing list.