Accepting request 922331 from Base:System

- Move to /usr for UsrMerge (boo#1191057) 

- Update to version 2.21
  * Merge pull request #4 from samueldr/fix/makefile
    Fixup Makefile for better build system support
  * Silent new gcc compiler

OBS-URL: https://build.opensuse.org/request/show/922331
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/blog?expand=0&rev=14

blog.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Sep 30 10:01:29 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Move to /usr for UsrMerge (boo#1191057) 
+
+-------------------------------------------------------------------
+Fri Apr  9 08:53:45 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Update to version 2.21
+  * Merge pull request #4 from samueldr/fix/makefile
+    Fixup Makefile for better build system support
+  * Silent new gcc compiler
+
 -------------------------------------------------------------------
 Fri Apr  9 07:19:38 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 

blog.spec

@@ -17,7 +17,7 @@
 
 
 Name:           blog
-Version:        2.20
+Version:        2.21
 %define sonum   2
 Release:        0
 Summary:        Boot logging
@@ -91,6 +91,9 @@ make %{?_smp_mflags} CC="%__cc" \
 %make_install \
     MANPATH=%{_mandir} \
     INSTBINFLAGS="-m 0744" \
+%if 0%{?usrmerged}
+    SBINDIR=%{_sbindir} \
+%endif
     LIBDIR=%{_libdir} \
     INCDIR=%{_includedir} \
     SYSDUNITS=%{_unitdir} \
@@ -114,12 +117,21 @@ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 %defattr(-,root,root)
 %license COPYING
 %doc README
+%if !0%{?usrmerged}
 /sbin/blogctl
 /sbin/blogd
 /sbin/blogger
 /sbin/isserial
 /sbin/setconsole
 /sbin/showconsole
+%else
+%{_sbindir}/blogctl
+%{_sbindir}/blogd
+%{_sbindir}/blogger
+%{_sbindir}/isserial
+%{_sbindir}/setconsole
+%{_sbindir}/showconsole
+%endif
 %doc %{_mandir}/man8/blogctl.8.gz
 %doc %{_mandir}/man8/blogd.8.gz
 %doc %{_mandir}/man8/blogger.8.gz

showconsole-2.20.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58f7db17b3f72d237242c9f285db3765c136af16e7c89c0e93bad278d27562fd
-size 39970

showconsole-2.21.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11119b59db8e1b64909c8ddf287a4b9ed75922f790fa9035d0ce1e0dcd5dfbee
+size 40065