rpm/crda
SHA256
1
0
Fork 0
forked from pool/crda
Code Pull Requests Activity

Accepting request 849582 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849582
OBS-URL: https://build.opensuse.org/package/show/hardware/crda?expand=0&rev=36
This commit is contained in:
Thomas Renninger 2020-11-23 18:13:06 +00:00 committed by Git OBS Bridge
parent 4ccf137d13
commit 33cf9b66ca
2 changed files with 9 additions and 4 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 Nov 17 13:43:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 17 17:34:41 CEST 2020 - ro@suse.de Mon Aug 17 17:34:41 CEST 2020 - ro@suse.de

8
crda.spec
View File

@ -67,10 +67,10 @@ make all_noverify %{?_smp_mflags} V=1
# to find ldconfig... # to find ldconfig...
export PATH=.:$PATH export PATH=.:$PATH
make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install
#UsrMerge %if !0%{?usrmerged}
mkdir $RPM_BUILD_ROOT/sbin mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
#EndUserMerge %endif
# clean up unneeded stuff... # clean up unneeded stuff...
rm -r %{buildroot}/usr/include/reglib rm -r %{buildroot}/usr/include/reglib
@ -80,10 +80,10 @@ rm -r %{buildroot}/usr/include/reglib
%_sbindir/crda %_sbindir/crda
%_sbindir/regdbdump %_sbindir/regdbdump
%_libdir/libreg.so %_libdir/libreg.so
#UsrMerge %if !0%{?usrmerged}
/sbin/crda /sbin/crda
/sbin/regdbdump /sbin/regdbdump
#EndUserMerge %endif
%{_udevrulesdir}/85-regulatory.rules %{_udevrulesdir}/85-regulatory.rules
%{_mandir}/man8/crda.8.gz %{_mandir}/man8/crda.8.gz
%{_mandir}/man8/regdbdump.8.gz %{_mandir}/man8/regdbdump.8.gz