Hello community, here is the log from the commit of package bootchart for openSUSE:Factory checked in at 2015-02-11 16:46:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bootchart (Old) and /work/SRC/openSUSE:Factory/.bootchart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bootchart" Changes: -------- --- /work/SRC/openSUSE:Factory/bootchart/bootchart.changes 2012-10-25 21:25:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bootchart.new/bootchart.changes 2015-02-11 16:46:08.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Feb 10 15:36:49 UTC 2015 - [email protected] + +- Update to version 0.14.7 + * bootchartd + - Use /bin/sh instead of bash + - Misc coverity fixes + - Fix systemd regression + * pybootchartgui + - Fix merging of logger process #56 +- Spec file refactoring +- Remove depreciated mkinitrd-boot.sh and mkinitrd-setup.sh scripts + files; use provided systemd unit files instead +- Add systemd support; add systemd-rpm-macros build require and + %{?systemd_requires} +- Move bootchart stuff to /usr +- Remove obsolete bootchart_init.patch +- Add bootchart-let-RMP-strip-manpages.patch; let RPM gzip itself + the manpages +- Remove mkinitrd dependency; not needed anymore +- Remove %system_requires; depreciated + +------------------------------------------------------------------- Old: ---- bootchart2-0.12.4.tar.bz2 bootchart_init.patch mkinitrd-boot.sh mkinitrd-setup.sh New: ---- bootchart-0.14.7.tar.gz bootchart-let-RMP-strip-manpages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootchart.spec ++++++ --- /var/tmp/diff_new_pack.hSl38r/_old 2015-02-11 16:46:09.000000000 +0100 +++ /var/tmp/diff_new_pack.hSl38r/_new 2015-02-11 16:46:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bootchart # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,87 +16,78 @@ # -%define real_bootchart2_version 0.12.4 -%if 0%{?suse_version} -%define system_requires lsb-release python-cairo python-gtk -%else -%define system_requires meego-lsb -%define py_sitedir /usr/lib/python2.6/site-packages -%define py_libdir /usr/lib/python2.6 -%endif +%define real_bootchart2_version 0.14.7 Name: bootchart BuildRequires: python-devel BuildRequires: fdupes -Url: http://www.bootchart.org +BuildRequires: systemd-rpm-macros +Requires: lsb-release +Requires: python-cairo +Requires: python-gtk +Url: https://github.com/mmeeks/bootchart License: GPL-3.0+ Group: Development/Tools/Other Summary: Boot Process Charting Application Version: 2.%{real_bootchart2_version} -Release: 2 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: bootchart2-%{real_bootchart2_version}.tar.bz2 -Source3: mkinitrd-boot.sh -Source4: mkinitrd-setup.sh -Patch1: bootchart_init.patch -Requires: %system_requires -Requires(post): mkinitrd +Source: bootchart-%{real_bootchart2_version}.tar.gz +Patch: bootchart-let-RMP-strip-manpages.patch +%{?systemd_requires} %description bootchart2 instruments your boot process and provides a tool to render a graph of what was happening during the boot process later. %prep -%setup -q -n bootchart2-%{real_bootchart2_version} -%patch1 -p1 +%setup -q -n bootchart-%{real_bootchart2_version} +%patch -p1 %build -export PY_LIBDIR=%py_libdir -export PY_SITEDIR=%py_sitedir -make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +export EARLY_PREFIX=%_prefix +make CFLAGS="%optflags" %{?_smp_mflags} %install export PY_LIBDIR=%py_libdir export PY_SITEDIR=%py_sitedir -make install DESTDIR=$RPM_BUILD_ROOT -# SUSE specific bits. -## Remove for now since they are broken, see bnc# -#install -m 755 -D %SOURCE3 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-bootchart.sh -#install -m 755 -D %SOURCE4 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-bootchart.sh -%fdupes %{buildroot}/%{_datadir} - -#%post -#[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -#if [ "$YAST_IS_RUNNING" != "instsys" -a \ -# ! -e /.buildenv -a \ -# -x /sbin/update-bootloader -a \ -# -x /sbin/mkinitrd ]; then -# /sbin/mkinitrd -# /sbin/update-bootloader --refresh -#fi -#exit 0 - -#%postun -#[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -#if [ "$YAST_IS_RUNNING" != "instsys" -a \ -# ! -e /.buildenv -a \ -# -x /sbin/update-bootloader -a \ -# -x /sbin/mkinitrd ]; then -# /sbin/mkinitrd -# /sbin/update-bootloader --refresh -#fi -#exit 0 +export EARLY_PREFIX=%_prefix +export DOCDIR=%_docdir/%name +make install DESTDIR=%{buildroot} +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbootchart2 +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbootchart2-done +%fdupes -s %{buildroot}%{python_sitelib} + +%pre +%service_add_pre bootchart2.service bootchart2-done.service bootchart2-done.timer + +%post +%service_add_post bootchart2.service bootchart2-done.service bootchart2-done.timer + +%preun +%service_del_preun bootchart2.service bootchart2-done.service bootchart2-done.timer + +%postun +%service_del_postun bootchart2.service bootchart2-done.service bootchart2-done.timer + %files %defattr(-,root,root) -%doc README COPYING -%dir /lib/bootchart -%dir /lib/bootchart/tmpfs -/lib/bootchart/bootchart-collector -/sbin/* -/usr/bin/* +%dir %{_libexecdir}/bootchart +%{_docdir}/* +%{_bindir}/pybootchartgui +%{_libexecdir}/bootchart/tmpfs +%{_libexecdir}/bootchart/bootchart-collector +%{_mandir}/man1/bootchart2.1.gz +%{_mandir}/man1/bootchartd.1.gz +%{_mandir}/man1/pybootchartgui.1.gz +%{_mandir}/man1/%{name}* +%{_sbindir}/bootchartd +%{_sbindir}/rcbootchart2 +%{_sbindir}/rcbootchart2-done +%{_unitdir}/bootchart2*.service +%{_unitdir}/bootchart2-done.timer %config(noreplace) /etc/bootchartd.conf -#/lib/mkinitrd %py_sitedir/pybootchartgui %changelog ++++++ bootchart-let-RMP-strip-manpages.patch ++++++ --- a/Makefile 2014-09-30 12:27:22.000000000 +0200 +++ b/Makefile 2015-02-10 08:10:32.079972590 +0100 @@ -107,9 +107,9 @@ install -m 644 -D README $(DESTDIR)$(DOCDIR)/README install -m 644 -D README.pybootchart $(DESTDIR)$(DOCDIR)/README.pybootchart mkdir -p $(DESTDIR)$(MANDIR) - gzip -c bootchart2.1 > $(DESTDIR)$(MANDIR)/bootchart2.1.gz - gzip -c bootchartd.1 > $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1.gz - gzip -c pybootchartgui.1 > $(DESTDIR)$(MANDIR)/pybootchartgui.1.gz + install -m 644 bootchart2.1 $(DESTDIR)$(MANDIR)/bootchart2.1 + install -m 644 bootchartd.1 $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1 + install -m 644 pybootchartgui.1 $(DESTDIR)$(MANDIR)/pybootchartgui.1 install-service: mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
