Skip to content

Commit 9690c79

Browse files
authored
bind: fix file conflicts (#12300)
1 parent 69826e8 commit 9690c79

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

SPECS/bind/bind.spec

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Domain Name System software
1111
Name: bind
1212
Version: 9.20.5
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: ISC
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -56,6 +56,7 @@ BuildRequires: systemd-libs
5656
BuildRequires: systemd-rpm-macros
5757
BuildRequires: userspace-rcu-devel
5858

59+
Requires: %{name}-libs = %{version}-%{release}
5960
Requires: libuv
6061
Requires: openssl
6162
Requires: userspace-rcu
@@ -377,9 +378,6 @@ fi;
377378
%dir %{_libdir}/bind
378379
%{_libdir}/bind/filter-a.so
379380
%{_libdir}/bind/filter-aaaa.so
380-
%{_libdir}/libdns*.so
381-
%{_libdir}/libisc*.so
382-
%{_libdir}/libns*.so
383381
%dir %{_libdir}/named
384382
%{_libdir}/named/*.so
385383
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
@@ -448,16 +446,15 @@ fi;
448446
%doc build/contrib/dlz/modules/sqlite3/testing/*
449447

450448
%files libs
451-
%{_libdir}/*-%{version}*.so
449+
%{_libdir}/libdns*.so
450+
%{_libdir}/libisc*.so
451+
%{_libdir}/libns*.so
452452

453453
%files license
454454
%license LICENSE
455455
%license COPYRIGHT
456456

457457
%files devel
458-
%{_libdir}/libisc*.so
459-
%{_libdir}/libns*.so
460-
%{_libdir}/libdns*.so
461458
%dir %{_includedir}/bind9
462459
%{_includedir}/bind9/config.h
463460
%{_includedir}/bind9/isccc
@@ -513,14 +510,24 @@ fi;
513510

514511
%files utils
515512
%defattr(-,root,root)
513+
%{_bindir}/dig
514+
%{_bindir}/delv
515+
%{_bindir}/host
516+
%{_bindir}/nslookup
517+
%{_bindir}/nsupdate
518+
%{_bindir}/arpaname
516519
%{_sbindir}/ddns-confgen
517520
%{_sbindir}/tsig-keygen
518521
%{_bindir}/nsec3hash
519522
%{_bindir}/named-checkzone
520523
%{_bindir}/named-compilezone
521524
%{_bindir}/named-nzd2nzf
522-
%{_bindir}/*
523-
%{_mandir}/man1/*
525+
%{_mandir}/man1/host.1*
526+
%{_mandir}/man1/nsupdate.1*
527+
%{_mandir}/man1/dig.1*
528+
%{_mandir}/man1/delv.1*
529+
%{_mandir}/man1/nslookup.1*
530+
%{_mandir}/man1/arpaname.1*
524531
%{_mandir}/man8/ddns-confgen.8*
525532
%{_mandir}/man8/tsig-keygen.8*
526533
%{_mandir}/man1/nsec3hash.1*
@@ -529,6 +536,11 @@ fi;
529536
%{_mandir}/man1/named-nzd2nzf.1*
530537

531538
%changelog
539+
* Tue Feb 11 2025 Andrew Phelps <[email protected]> - 9.20.5-4
540+
- Remove duplicate shared object files in base and devel packages
541+
- Remove duplicate files from utils package
542+
- Add requires for bind-libs from base package
543+
532544
* Thu Feb 27 2025 Tobias Brick <[email protected]> - 9.20.5-3
533545
- Fix uninitialized memory warning.
534546

0 commit comments

Comments
 (0)