rpm pkg: don't package xml-builder anymore

diff --git a/Makefile b/Makefile
index 144c06c..2dfa229 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PREFIX=/usr
 ##########
 all: python wsdl 
 
 ##########
 all: python wsdl 
 

-install: python-install wsdl-install xmlbuilder-install tests-install
+install: python-install wsdl-install tests-install

 
 clean: python-clean wsdl-clean 
 
 
 clean: python-clean wsdl-clean 
 


@@ -28,10 +28,6 @@ version: sfa/util/version.py
 sfa/util/version.py: sfa/util/version.py.in force
        sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 
 sfa/util/version.py: sfa/util/version.py.in force
        sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 

-xmlbuilder-install:
-       cd xmlbuilder-0.9 && python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) && cd -
-       rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
-

 # postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
        python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)
 # postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
        python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)


@@ -47,7 +43,7 @@ python-clean: version-clean
 version-clean:
        rm -f sfa/util/version.py
 
 version-clean:
        rm -f sfa/util/version.py
 

-.PHONY: python version python-install python-clean version-clean xmlbuilder-install 
+.PHONY: python version python-install python-clean version-clean 

 ##########
 wsdl: 
        $(MAKE) -C wsdl 
 ##########
 wsdl: 
        $(MAKE) -C wsdl 

diff --git a/sfa.spec b/sfa.spec
index ed3af43..3a1d6c7 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -34,7 +34,7 @@ Requires: python-psycopg2
 Requires: python-sqlalchemy
 Requires: python-migrate
 # the eucalyptus aggregate uses this module
 Requires: python-sqlalchemy
 Requires: python-migrate
 # the eucalyptus aggregate uses this module

-Requires: python-xmlbuilder
+#Requires: python-xmlbuilder

 # for uuidgen - used in db password generation
 # on f8 this actually comes with e2fsprogs, go figure
 Requires: util-linux-ng
 # for uuidgen - used in db password generation
 # on f8 this actually comes with e2fsprogs, go figure
 Requires: util-linux-ng


@@ -94,11 +94,6 @@ Summary: sfatables policy tool for SFA
 Group: Applications/System
 Requires: sfa
 
 Group: Applications/System
 Requires: sfa
 

-%package xmlbuilder
-Summary: third-party xmlbuilder tool
-Group: Applications/System
-Provides: python-xmlbuilder
-

 %package tests
 Summary: unit tests suite for SFA
 Group: Applications/System
 %package tests
 Summary: unit tests suite for SFA
 Group: Applications/System


@@ -140,10 +135,6 @@ sfatables is a tool for defining access and admission control policies
 in an SFA network, in much the same way as iptables is for ip
 networks. This is the command line interface to manage sfatables
 
 in an SFA network, in much the same way as iptables is for ip
 networks. This is the command line interface to manage sfatables
 

-%description xmlbuilder
-This package contains the xmlbuilder python library, packaged for
-convenience as it is not supported by fedora
-

 %description tests
 Provides some binary unit tests in /usr/share/sfa/tests
 
 %description tests
 Provides some binary unit tests in /usr/share/sfa/tests
 


@@ -232,9 +223,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/sfatables
 %{python_sitelib}/sfatables
 
 %{_bindir}/sfatables
 %{python_sitelib}/sfatables
 

-%files xmlbuilder
-%{python_sitelib}/xmlbuilder
-

 %files tests
 %{_datadir}/sfa/tests
 
 %files tests
 %{_datadir}/sfa/tests