rpms/bzrtools/devel bzrtools.spec,1.20,1.21

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

Update of /cvs/extras/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27900

Modified Files:
	bzrtools.spec 
Log Message:
* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
- Move plugin manually since setuptools has no way of knowing that bzr is
  arch specific.
- Disable debuginfo packages.



Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bzrtools.spec	30 Aug 2007 10:17:16 -0000	1.20
+++ bzrtools.spec	30 Aug 2007 22:47:24 -0000	1.21
@@ -1,11 +1,16 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
 %define bzrver 0.90
 %define bzrnextver 0.91
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -45,6 +50,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins
+fi
+
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
 
@@ -62,6 +72,11 @@
 %{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move plugin manually since setuptools has no way of knowing that bzr is
+  arch specific.
+- Disable debuginfo packages.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
 - Update to 0.90.0.
 - Fix License tag to conform to the new Licensing Guidelines.