Skip to content

Commit

Permalink
bind: fix file conflicts (#12300)
Browse files Browse the repository at this point in the history
  • Loading branch information
anphel31 authored Mar 3, 2025
1 parent 69826e8 commit 9690c79
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions SPECS/bind/bind.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Domain Name System software
Name: bind
Version: 9.20.5
Release: 3%{?dist}
Release: 4%{?dist}
License: ISC
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -56,6 +56,7 @@ BuildRequires: systemd-libs
BuildRequires: systemd-rpm-macros
BuildRequires: userspace-rcu-devel

Requires: %{name}-libs = %{version}-%{release}
Requires: libuv
Requires: openssl
Requires: userspace-rcu
Expand Down Expand Up @@ -377,9 +378,6 @@ fi;
%dir %{_libdir}/bind
%{_libdir}/bind/filter-a.so
%{_libdir}/bind/filter-aaaa.so
%{_libdir}/libdns*.so
%{_libdir}/libisc*.so
%{_libdir}/libns*.so
%dir %{_libdir}/named
%{_libdir}/named/*.so
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
Expand Down Expand Up @@ -448,16 +446,15 @@ fi;
%doc build/contrib/dlz/modules/sqlite3/testing/*

%files libs
%{_libdir}/*-%{version}*.so
%{_libdir}/libdns*.so
%{_libdir}/libisc*.so
%{_libdir}/libns*.so

%files license
%license LICENSE
%license COPYRIGHT

%files devel
%{_libdir}/libisc*.so
%{_libdir}/libns*.so
%{_libdir}/libdns*.so
%dir %{_includedir}/bind9
%{_includedir}/bind9/config.h
%{_includedir}/bind9/isccc
Expand Down Expand Up @@ -513,14 +510,24 @@ fi;

%files utils
%defattr(-,root,root)
%{_bindir}/dig
%{_bindir}/delv
%{_bindir}/host
%{_bindir}/nslookup
%{_bindir}/nsupdate
%{_bindir}/arpaname
%{_sbindir}/ddns-confgen
%{_sbindir}/tsig-keygen
%{_bindir}/nsec3hash
%{_bindir}/named-checkzone
%{_bindir}/named-compilezone
%{_bindir}/named-nzd2nzf
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man1/host.1*
%{_mandir}/man1/nsupdate.1*
%{_mandir}/man1/dig.1*
%{_mandir}/man1/delv.1*
%{_mandir}/man1/nslookup.1*
%{_mandir}/man1/arpaname.1*
%{_mandir}/man8/ddns-confgen.8*
%{_mandir}/man8/tsig-keygen.8*
%{_mandir}/man1/nsec3hash.1*
Expand All @@ -529,6 +536,11 @@ fi;
%{_mandir}/man1/named-nzd2nzf.1*

%changelog
* Tue Feb 11 2025 Andrew Phelps <[email protected]> - 9.20.5-4
- Remove duplicate shared object files in base and devel packages
- Remove duplicate files from utils package
- Add requires for bind-libs from base package

* Thu Feb 27 2025 Tobias Brick <[email protected]> - 9.20.5-3
- Fix uninitialized memory warning.

Expand Down

0 comments on commit 9690c79

Please sign in to comment.