[bootchart/f15/master] really fix python subdir

Daniel Williams dcbw at fedoraproject.org
Mon Feb 14 21:26:19 UTC 2011


commit b13348d85e73293bfc61352a903d1d1634d20207
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Feb 14 15:27:24 2011 -0600

    really fix python subdir

 bootchart.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/bootchart.spec b/bootchart.spec
index 81975b6..004b06c 100644
--- a/bootchart.spec
+++ b/bootchart.spec
@@ -2,7 +2,7 @@
 
 Name:           bootchart 
 Version:        0.12.4
-Release:        5.1.git20101122%{?dist}
+Release:        6.1.git20101122%{?dist}
 Summary:        Boot Process Performance Visualization
 License:        GPLv2+ and GPLv3+
 URL:            https://github.com/mmeeks/bootchart
@@ -117,10 +117,13 @@ file.
 %build
 make CFLAGS="$RPM_OPT_FLAGS" 
 
+# bootchart adds 'site-packages' itself, so we just want eg /usr/lib/python2.7 here
+%define python_libdir `echo "%{python_sitelib}" | sed 's/\\/site-packages//'`
+
 %install
 make install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	PY_LIBDIR=%{python_sitelib} \
+	PY_LIBDIR=%{python_libdir}\
 	NO_PYTHON_COMPILE=1 \
 	SYSTEMD_UNIT_DIR=%{systemdsystemunitdir}
 
@@ -176,6 +179,9 @@ fi
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/bootchartd.conf
 
 %changelog
+* Mon Feb 13 2011 Dan Williams <dcbw at redhat.com> 0.12.4-6.1.git20101122
+- really fix python subdir
+
 * Wed Feb 09 2011 Harald Hoyer <harald at redhat.com> 0.12.4-5.1.git20101122
 - fixed python subdir
 


More information about the scm-commits mailing list