diff --git a/blog-rpmlintrc b/blog-rpmlintrc index 83ec2b1..d35cd48 100644 --- a/blog-rpmlintrc +++ b/blog-rpmlintrc @@ -1,3 +1,4 @@ addFilter(".*systemd-service-without-service_del_p.*") addFilter(".*systemd-service-without-service_add_p.*") addFilter(".*suse-missing-rclink.*") +addFilter(".*E:.*unused-rpmlintrc-filter.*suse-missing-rclink.*") diff --git a/blog.changes b/blog.changes index 0c554de..2fe0c71 100644 --- a/blog.changes +++ b/blog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 2 13:11:05 UTC 2021 - Dr. Werner Fink + +- Update to version 2.24 + * Avoid install errror due missed directory + ------------------------------------------------------------------- Thu Dec 2 11:36:36 UTC 2021 - Dr. Werner Fink diff --git a/blog.patch b/blog.patch deleted file mode 100644 index 60f00ed..0000000 --- a/blog.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git Makefile Makefile -index 1e542f5..3b3a05e 100644 ---- Makefile -+++ Makefile -@@ -15,7 +15,7 @@ BOOT_FIFO = /dev/blog - DEBUG = - DESTDIR = - MAJOR := 2 --MINOR := 22 -+MINOR := 23 - VERSION := $(MAJOR).$(MINOR) - DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') - COPTS = -@@ -146,6 +146,9 @@ install: $(TODO) - for target in default sysinit basic local-fs-pre rescue shutdown emergency initrd-switch-root; do \ - $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.target.wants ; \ - done -+ for service in systemd-ask-password-blog ; do \ -+ $(MKDIR) $(DESTDIR)$(SYSDUNITS)/$${target}.service.wants ; \ -+ done - for unit in blog-quit.service ; do \ - $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/default.target.wants/$${unit} ; \ - $(LINK) ../$${unit} $(DESTDIR)$(SYSDUNITS)/rescue.target.wants/$${unit} ; \ diff --git a/blog.spec b/blog.spec index 877bed5..6d9bf36 100644 --- a/blog.spec +++ b/blog.spec @@ -17,7 +17,7 @@ Name: blog -Version: 2.22 +Version: 2.24 %define sonum 2 Release: 0 Summary: Boot logging @@ -26,11 +26,13 @@ Group: System/Base URL: https://github.com/bitstreamout/showconsole Source: https://github.com/bitstreamout/showconsole/archive/v%{version}.tar.gz#/showconsole-%{version}.tar.gz Source1: blog-rpmlintrc -Patch0: blog.patch BuildRequires: suse-module-tools +BuildRequires: systemd Requires(post): coreutils +Requires: systemd BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: sysvinit-tools:/sbin/blogd +Suggests: blog-plymouth = %{version} %description The blogd daemon determines the real underlying character device of @@ -53,7 +55,7 @@ The libaray for the FIFO interface used by the LSB startproc command. %package plymouth Summary: Replaces plymouth by blogd Group: System/Base -Requires: blog +Requires: blog = %{version} Requires: systemd Conflicts: plymouth Conflicts: plymouth-dracut @@ -79,7 +81,6 @@ the LSB startproc command. %prep %setup -q -n showconsole-%version -%patch0 %build make %{?_smp_mflags} CC="%__cc" \ @@ -151,21 +152,18 @@ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : %files plymouth %defattr(-,root,root) -%dir %{_prefix}/lib/dracut -%dir %{_prefix}/lib/dracut/modules.d -%dir %{_prefix}/lib/dracut/modules.d/99blog -%dir %{_unitdir}/basic.target.wants -%dir %{_unitdir}/default.target.wants -%dir %{_unitdir}/emergency.target.wants -%dir %{_unitdir}/halt.target.wants -%dir %{_unitdir}/initrd-switch-root.target.wants -%dir %{_unitdir}/kexec.target.wants -%dir %{_unitdir}/multi-user.target.wants -%dir %{_unitdir}/poweroff.target.wants -%dir %{_unitdir}/reboot.target.wants -%dir %{_unitdir}/rescue.target.wants -%dir %{_unitdir}/sysinit.target.wants -%dir %{_unitdir}/systemd-ask-password-blog.service.wants +%dir %{_prefix}/lib/dracut/ +%dir %{_prefix}/lib/dracut/modules.d/ +%dir %{_prefix}/lib/dracut/modules.d/99blog/ +%dir %{_unitdir}/basic.target.wants/ +%dir %{_unitdir}/default.target.wants/ +%dir %{_unitdir}/emergency.target.wants/ +%dir %{_unitdir}/initrd-switch-root.target.wants/ +%dir %{_unitdir}/rescue.target.wants/ +%dir %{_unitdir}/sysinit.target.wants/ +%dir %{_unitdir}/shutdown.target.wants/ +%dir %{_unitdir}/local-fs-pre.target.wants/ +%dir %{_unitdir}/systemd-ask-password-blog.service.wants/ %{_prefix}/lib/dracut/modules.d/99blog/module-setup.sh %{_unitdir}/blog-final.service %{_unitdir}/blog-quit.service @@ -178,18 +176,13 @@ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : %{_unitdir}/basic.target.wants/blog.service %{_unitdir}/default.target.wants/blog-quit.service %{_unitdir}/emergency.target.wants/blog-quit.service -%{_unitdir}/halt.target.wants/blog-final.service -%{_unitdir}/halt.target.wants/blog-umount.service %{_unitdir}/initrd-switch-root.target.wants/blog-switch-root.service %{_unitdir}/initrd-switch-root.target.wants/blog.service -%{_unitdir}/kexec.target.wants/blog-final.service -%{_unitdir}/kexec.target.wants/blog-umount.service -%{_unitdir}/poweroff.target.wants/blog-final.service -%{_unitdir}/poweroff.target.wants/blog-umount.service -%{_unitdir}/reboot.target.wants/blog-final.service -%{_unitdir}/reboot.target.wants/blog-umount.service %{_unitdir}/rescue.target.wants/blog-quit.service %{_unitdir}/sysinit.target.wants/blog-store-messages.service %{_unitdir}/sysinit.target.wants/systemd-ask-password-blog.path +%{_unitdir}/shutdown.target.wants/blog-final.service +%{_unitdir}/local-fs-pre.target.wants/blog-umount.service +%{_unitdir}/systemd-ask-password-blog.service.wants/systemd-vconsole-setup.service %changelog diff --git a/showconsole-2.22.tar.gz b/showconsole-2.22.tar.gz deleted file mode 100644 index e9c3de8..0000000 --- a/showconsole-2.22.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d463001b3dd2b6701c4c071ab01ccd0eeed6a2d7a2c7df8efc5e815441baa635 -size 40669 diff --git a/showconsole-2.24.tar.gz b/showconsole-2.24.tar.gz new file mode 100644 index 0000000..60e1379 --- /dev/null +++ b/showconsole-2.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad3a2732a02d95704b58e94c12c99a80a7bbdb3e77b8b6b90b0e709119c447ab +size 40681