Accepting request 1057034 from Base:System

- Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1051492 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1057034
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/blog?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2023-01-10 13:59:18 +00:00 committed by Git OBS Bridge
commit 2e0df2bf10
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:23:56 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Fri Dec 3 08:20:08 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package blog
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -92,7 +92,7 @@ make %{?_smp_mflags} CC="%__cc" \
%make_install \
MANPATH=%{_mandir} \
INSTBINFLAGS="-m 0744" \
%if 0%{?usrmerged}
%if 0%{?suse_version} >= 1550
SBINDIR=%{_sbindir} \
%endif
LIBDIR=%{_libdir} \
@ -121,7 +121,7 @@ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || :
%defattr(-,root,root)
%license COPYING
%doc README
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/blogctl
/sbin/blogd
/sbin/blogger