Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2019-01-24 14:13:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ppc64-diag" Thu Jan 24 14:13:05 2019 rev:42 rq:667733 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2018-11-12 09:46:53.148694667 +0100 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new.28833/ppc64-diag.changes 2019-01-24 14:13:05.943384355 +0100 @@ -1,0 +2,14 @@ +Tue Jan 22 08:24:44 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Drop pointless _service file +- Format with spec-cleaner + +------------------------------------------------------------------- +Fri Jan 18 14:07:53 UTC 2019 - [email protected] + +- If a system does not have any enclosures, let the daily cron + script "run_diag_encl"exit gracefully to prevent bogus + error messages in root's mailbox. + [bsc#1113097, bsc1113097-run_diag_encl-exit-gracefully.patch] + +------------------------------------------------------------------- Old: ---- _service New: ---- bsc1113097-run_diag_encl-exit-gracefully.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.5A2UKO/_old 2019-01-24 14:13:06.495383717 +0100 +++ /var/tmp/diff_new_pack.5A2UKO/_new 2019-01-24 14:13:06.499383713 +0100 @@ -1,7 +1,7 @@ # # spec file for package ppc64-diag # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag Version: 2.7.4 Release: 0 Summary: Linux for Power Platform Diagnostics -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Monitoring -ExclusiveArch: ppc ppc64 ppc64le +URL: http://sourceforge.net/projects/linux-diag/files/ppc64-diag +Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v%{version}/%{name}-%{version}.tar.gz +#PATCH-FIX-OPENSUSE - ppc64-diag.varunused.patch - fix unused variables +Patch1: ppc64-diag.varunused.patch +Patch2: ppc64-diag.bug-1072708_fix_service_scripts.patch +Patch3: ppc64-diag.bug-1072708_create_diag_disk_path.patch +Patch4: ppc64-diag.bug-1072708_increase_buffer_for_vpd.patch +Patch5: ppc64-diag.bug-1072708_remove_timestamp.patch +Patch6: ppc64-diag.bug-1072708_create_diag_disk_log_directory.patch +Patch7: bsc1113097-run_diag_encl-exit-gracefully.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -32,32 +40,23 @@ BuildRequires: librtas-devel >= 1.4.0 BuildRequires: libservicelog-devel BuildRequires: libtool -BuildRequires: libudev-devel -BuildRequires: libvpd2-devel -BuildRequires: ncurses-devel BuildRequires: perl -BuildRequires: sqlite3-devel +BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libvpd-2) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(sqlite3) Requires: cron -Requires: servicelog -Requires: systemd -# License change -Requires: powerpc-utils >= 1.3.2 # Light Path Diagnostics depends on below lsvpd version. Requires: lsvpd >= 1.7.1 +Requires: powerpc-utils >= 1.3.2 +Requires: servicelog +Requires(post): aaa_base # autoselect the package on systems which have the /vdevice/IBM,sp node # All pSeries POWER5 and later have this property Supplements: modalias(vio:TIBM*spS*) -PreReq: aaa_base -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v%{version}/%{name}-%{version}.tar.gz -#PATCH-FIX-OPENSUSE - ppc64-diag.varunused.patch - fix unused variables -Patch1: %{name}.varunused.patch -Patch2: ppc64-diag.bug-1072708_fix_service_scripts.patch -Patch3: ppc64-diag.bug-1072708_create_diag_disk_path.patch -Patch4: ppc64-diag.bug-1072708_increase_buffer_for_vpd.patch -Patch5: ppc64-diag.bug-1072708_remove_timestamp.patch -Patch6: ppc64-diag.bug-1072708_create_diag_disk_log_directory.patch +ExclusiveArch: ppc ppc64 ppc64le %description This package contains various diagnostic tools for PowerLinux. @@ -69,10 +68,6 @@ indicator(s) and provides event notification to system administrators or connected service frameworks. -Authors: --------- - IBM Corporation - %prep %setup -q %patch1 -p1 @@ -81,55 +76,54 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build -sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/opal_errd.service -sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/rtas_errd.service -./autogen.sh +sed -i 's@%{_prefix}/libexec/ppc64-diag@%{_libexecdir}@g' scripts/opal_errd.service +sed -i 's@%{_prefix}/libexec/ppc64-diag@%{_libexecdir}@g' scripts/rtas_errd.service +autoreconf -fvi %configure -make +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -chmod 644 $RPM_BUILD_ROOT/etc/ppc64-diag/servevent_parse.pl -mkdir $RPM_BUILD_ROOT/etc/ppc64-diag/ses_pages -ln -sf /usr/sbin/usysattn $RPM_BUILD_ROOT/usr/sbin/usysfault -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -D -m0644 scripts/rtas_errd.service %{buildroot}%{_unitdir}/ -install -D -m0644 scripts/opal_errd.service %{buildroot}%{_unitdir}/ -ln -s /sbin/service %{buildroot}/usr/sbin/rcrtas_errd -ln -s /sbin/service %{buildroot}/usr/sbin/rcopal_errd -rm %{buildroot}/usr/libexec/%{name}/opal_errd -rm %{buildroot}/usr/libexec/%{name}/rtas_errd -rm %{buildroot}/usr/share/doc/%{name}/COPYING -rm %{buildroot}/usr/share/doc/%{name}/README +%make_install +chmod 644 %{buildroot}%{_sysconfdir}/ppc64-diag/servevent_parse.pl +mkdir %{buildroot}%{_sysconfdir}/ppc64-diag/ses_pages +ln -sf %{_sbindir}/usysattn %{buildroot}%{_sbindir}/usysfault +install -D -m0644 scripts/rtas_errd.service %{buildroot}%{_unitdir}/rtas_errd.service +install -D -m0644 scripts/opal_errd.service %{buildroot}%{_unitdir}/opal_errd.service +ln -s service %{buildroot}%{_sbindir}/rcrtas_errd +ln -s service %{buildroot}%{_sbindir}/rcopal_errd +rm %{buildroot}%{_prefix}/libexec/%{name}/opal_errd +rm %{buildroot}%{_prefix}/libexec/%{name}/rtas_errd +rm %{buildroot}%{_datadir}/doc/%{name}/COPYING +rm %{buildroot}%{_datadir}/doc/%{name}/README %files -%defattr (-,root,root,-) -%doc COPYING +%license COPYING %doc README -/usr/sbin/* -%dir /etc/ppc64-diag -%config /etc/ppc64-diag/* -%config /etc/rc.powerfail -%{_mandir}/man8/explain_syslog.8.gz -%{_mandir}/man8/syslog_to_svclog.8.gz -%{_mandir}/man8/diag_encl.8.gz -%{_mandir}/man8/encl_led.8.gz -%{_mandir}/man8/lp_diag.8.gz -%{_mandir}/man8/usysattn.8.gz -%{_mandir}/man8/usysfault.8.gz -%{_mandir}/man8/usysident.8.gz -%{_mandir}/man8/opal-dump-parse.8.gz -%{_mandir}/man8/opal-elog-parse.8.gz -%{_mandir}/man8/opal_errd.8.gz -%attr(755,root,root) /etc/cron.daily/run_diag_encl +%{_sbindir}/* +%dir %{_sysconfdir}/ppc64-diag +%config %{_sysconfdir}/ppc64-diag/* +%config %{_sysconfdir}/rc.powerfail +%{_mandir}/man8/explain_syslog.8%{?ext_man} +%{_mandir}/man8/syslog_to_svclog.8%{?ext_man} +%{_mandir}/man8/diag_encl.8%{?ext_man} +%{_mandir}/man8/encl_led.8%{?ext_man} +%{_mandir}/man8/lp_diag.8%{?ext_man} +%{_mandir}/man8/usysattn.8%{?ext_man} +%{_mandir}/man8/usysfault.8%{?ext_man} +%{_mandir}/man8/usysident.8%{?ext_man} +%{_mandir}/man8/opal-dump-parse.8%{?ext_man} +%{_mandir}/man8/opal-elog-parse.8%{?ext_man} +%{_mandir}/man8/opal_errd.8%{?ext_man} +%attr(755,root,root) %{_sysconfdir}/cron.daily/run_diag_encl %{_unitdir}/rtas_errd.service %{_unitdir}/opal_errd.service %post -/etc/ppc64-diag/ppc64_diag_setup --register >/dev/null 2>&1 -/etc/ppc64-diag/lp_diag_setup --register >/dev/null 2>&1 +%{_sysconfdir}/ppc64-diag/ppc64_diag_setup --register >/dev/null 2>&1 +%{_sysconfdir}/ppc64-diag/lp_diag_setup --register >/dev/null 2>&1 %service_add_post rtas_errd.service %service_add_post opal_errd.service @@ -138,8 +132,8 @@ if [ "$1" = "0" ]; then # last uninstall %service_del_preun rtas_errd.service %service_del_preun opal_errd.service - /etc/ppc64-diag/ppc64_diag_setup --unregister >/dev/null - /etc/ppc64-diag/lp_diag_setup --unregister >/dev/null + %{_sysconfdir}/ppc64-diag/ppc64_diag_setup --unregister >/dev/null + %{_sysconfdir}/ppc64-diag/lp_diag_setup --unregister >/dev/null fi %triggerin -- librtas ++++++ bsc1113097-run_diag_encl-exit-gracefully.patch ++++++ Index: ppc64-diag-2.7.4/diags/run_diag_encl =================================================================== --- ppc64-diag-2.7.4.orig/diags/run_diag_encl +++ ppc64-diag-2.7.4/diags/run_diag_encl @@ -3,3 +3,5 @@ if [ -x /usr/sbin/diag_encl ]; then /usr/sbin/diag_encl -c -s -l > /dev/null 2>&1 fi +# Exit gracefully +exit 0
