Hello community, here is the log from the commit of package bootchart for openSUSE:Factory checked in at Wed May 20 12:02:33 CEST 2009. -------- --- bootchart/bootchart.changes 2009-04-30 15:58:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/bootchart/bootchart.changes 2009-05-19 15:37:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 19 15:32:06 CEST 2009 - coolo@suse.de + +- don't use java but python (removes noarch) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bootchart-java14.diff commons-cli-1.0.jar New: ---- pybootchartgui-r124.diff pybootchartgui-r124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootchart.spec ++++++ --- /var/tmp/diff_new_pack.bP2175/_old 2009-05-20 12:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.bP2175/_new 2009-05-20 12:02:21.000000000 +0200 @@ -19,23 +19,22 @@ Name: bootchart -BuildRequires: ant java2-devel-packages sysstat xml-commons-apis +BuildRequires: fdupes python-devel sysstat Url: http://www.bootchart.org License: GPL v2 or later Group: Development/Tools/Other Summary: Boot Process Charting Application Version: 0.9 -Release: 293 +Release: 294 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 -Source1: commons-cli-1.0.jar Source2: mkinitrd-boot.sh Source3: mkinitrd-setup.sh Source4: README.SUSE +Source5: pybootchartgui-r124.tar.bz2 +Patch0: pybootchartgui-r124.diff Patch1: %name-%version.diff -Patch2: bootchart-java14.diff -Requires: acct jpackage-utils -BuildArch: noarch +Requires: acct python-cairo python-gtk Requires(post): mkinitrd %description @@ -49,25 +48,31 @@ Ziga Mahkovec <ziga.mahkovec@klika.si> %prep -%setup -q +%setup -q -a 5 +%patch0 %patch1 -p1 -%patch2 %build -ant jar %install mkdir -p $RPM_BUILD_ROOT/lib/bootchart/mnt install -m 755 -D script/bootchartd $RPM_BUILD_ROOT/sbin/bootchartd install -m 644 -D script/bootchartd.conf $RPM_BUILD_ROOT/etc/bootchartd.conf -install -m 755 -D script/bootchart $RPM_BUILD_ROOT/usr/bin/bootchart -install -m 644 -D bootchart.jar $RPM_BUILD_ROOT/usr/share/java/bootchart.jar +#install -m 755 -D script/bootchart $RPM_BUILD_ROOT/usr/bin/bootchart install -d $RPM_BUILD_ROOT/usr/share/bootchart -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/java/bootchart-commons-cli.jar install -m 755 -D %SOURCE2 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-bootchart.sh install -m 755 -D %SOURCE3 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-bootchart.sh cp -a svg $RPM_BUILD_ROOT/usr/share/bootchart cp %SOURCE4 . +cd pybootchartgui-r*/ +install -d $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +cp pybootchartgui/*.py $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +install -D -m 755 pybootchartgui.py $RPM_BUILD_ROOT%_bindir/pybootchartgui +pushd $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +python %py_libdir/py_compile.py *.py +PYTHONOPTIMIZE=1 python %py_libdir/py_compile.py *.py +popd +%fdupes %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -89,11 +94,13 @@ /sbin/* /usr/bin/* %config(noreplace) /etc/bootchartd.conf -/usr/share/java/*.jar /usr/share/bootchart /lib/mkinitrd +%py_sitedir/pybootchartgui %changelog +* Tue May 19 2009 coolo@suse.de +- don't use java but python (removes noarch) * Thu Apr 30 2009 coolo@suse.de - remove mingetty from the list of processes to check for, it's just not our target ++++++ bootchart-0.9.diff ++++++ --- /var/tmp/diff_new_pack.bP2175/_old 2009-05-20 12:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.bP2175/_new 2009-05-20 12:02:21.000000000 +0200 @@ -105,9 +105,10 @@ # Render the chart if configured (and the renderer is installed) - [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/bootchart ] && \ -+ if [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/bootchart ]; then +- /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" ++ if [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/pybootchartgui ]; then + cd $AUTO_RENDER_DIR - /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" ++ /usr/bin/pybootchartgui -o "$AUTO_RENDER_DIR"/bootchart.$AUTO_RENDER_FORMAT -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" + fi } ++++++ pybootchartgui-r124.diff ++++++ diff -ru pybootchartgui-r124.orig/pybootchartgui/draw.py pybootchartgui-r124/pybootchartgui/draw.py --- pybootchartgui-r124.orig/pybootchartgui/draw.py 2009-04-14 22:42:11.000000000 +0200 +++ pybootchartgui-r124/pybootchartgui/draw.py 2009-05-19 15:32:54.000000000 +0200 @@ -164,7 +164,8 @@ return x, y xscale = float(chart_bounds[2]) / max(x for (x,y) in data) - yscale = float(chart_bounds[3]) / max(y for (x,y) in data) + maxy = max(1, max(y for (x,y) in data)) + yscale = float(chart_bounds[3]) / maxy first = transform_point_coords(data[0], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1]) last = transform_point_coords(data[-1], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org