pool/crda
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1052797 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1052797
OBS-URL: https://build.opensuse.org/package/show/hardware/crda?expand=0&rev=40
This commit is contained in:
Michal Suchanek 2023-01-17 10:40:53 +00:00 committed by Git OBS Bridge
parent 62d19b56ae
commit 666886db7b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crda.changes
View File

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

6
crda.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package crda
#
# Copyright (c) 2020 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
@ -73,7 +73,7 @@ export PATH=.:$PATH
make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install
mkdir -p %{buildroot}%{_prefix}%{_sysconfdir}/default
install -m 644 %{S:1} %{buildroot}%{_prefix}%{_sysconfdir}/default/%{name}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
%endif
@ -86,7 +86,7 @@ rm -r %{buildroot}/usr/include/reglib
%_sbindir/crda
%_sbindir/regdbdump
%_libdir/libreg.so
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/crda
/sbin/regdbdump
%endif