Accepting request 986120 from home:1Antoine1:branches:network

- Add ldconfig scriptlets.
- Fix 'Conflicts:' tags.
- Remove obsolete macros and conditionals.
- Ran spec-cleaner.

OBS-URL: https://build.opensuse.org/request/show/986120
OBS-URL: https://build.opensuse.org/package/show/network/libheimdal?expand=0&rev=27
This commit is contained in:
Dirk Mueller 2022-07-03 15:26:21 +00:00 committed by Git OBS Bridge
parent a4d27825eb
commit cd7ced2f11
2 changed files with 72 additions and 54 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 30 20:44:57 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
- Add ldconfig scriptlets.
- Fix 'Conflicts:' tags.
- Remove obsolete macros and conditionals.
- Ran spec-cleaner.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 28 18:47:19 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org> Tue Jun 28 18:47:19 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>

View File

@ -17,12 +17,12 @@
Name: libheimdal Name: libheimdal
Version: 7.7.0
Release: 0
Summary: The Heimdal implementation of the Kerberos 5 protocol Summary: The Heimdal implementation of the Kerberos 5 protocol
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Version: 7.7.0 URL: https://www.h5l.org
Release: 0
URL: http://www.h5l.org
# patched source can be created with script heimdal-patch-source.sh: # patched source can be created with script heimdal-patch-source.sh:
# ./heimdal-patch-source.sh heimdal-%{version}.tar.gz # ./heimdal-patch-source.sh heimdal-%{version}.tar.gz
Source0: heimdal-%{version}-patched.tar.bz2 Source0: heimdal-%{version}-patched.tar.bz2
@ -32,28 +32,19 @@ Patch0: heimdal-patched.diff
Patch1: reproducible.patch Patch1: reproducible.patch
# PATCH-FIX-UPSTREAM heimdal-7.7.0-autoconf-2.70.patch -- fix build with autoconf 2.70 (gh#heimdal/heimdal#856) # PATCH-FIX-UPSTREAM heimdal-7.7.0-autoconf-2.70.patch -- fix build with autoconf 2.70 (gh#heimdal/heimdal#856)
Patch2: heimdal-7.7.0-autoconf-2.70.patch Patch2: heimdal-7.7.0-autoconf-2.70.patch
%if 0%{?sles_version} == 11
BuildRequires: libcom_err-devel
BuildRequires: sqlite3-devel
%else
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(sqlite3)
%endif
%if 0%{suse_version} > 1315
BuildRequires: pkgconfig(ncurses) >= 5.3
%else
BuildRequires: ncurses-devel >= 5.3
%endif
BuildRequires: automake >= 1.11 BuildRequires: automake >= 1.11
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel >= 4.8 BuildRequires: db-devel >= 4.8
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: texinfo BuildRequires: texinfo
BuildRequires: perl(JSON) BuildRequires: perl(JSON)
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(ncurses) >= 5.3
BuildRequires: pkgconfig(sqlite3)
%description %description
Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written
@ -69,7 +60,7 @@ libraries are required by 64-bit package of ICAClient version 13.2.
%package -n libasn1-8 %package -n libasn1-8
Summary: ASN.1 implementation from Heimdal Kerberos Summary: ASN.1 implementation from Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libasn1-8 %description -n libasn1-8
This package contains the ASN.1 parser required for Heimdal. This package contains the ASN.1 parser required for Heimdal.
@ -77,7 +68,7 @@ This package contains the ASN.1 parser required for Heimdal.
%package -n libgssapi3 %package -n libgssapi3
Summary: GSSAPI implementation from Heimdal Kerberos Summary: GSSAPI implementation from Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libgssapi3 %description -n libgssapi3
GSSAPI implementation from Heimdal. GSSAPI implementation from Heimdal.
@ -85,7 +76,7 @@ GSSAPI implementation from Heimdal.
%package -n libhcrypto4 %package -n libhcrypto4
Summary: Cryptographic library from Heimdal Kerberos Summary: Cryptographic library from Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libhcrypto4 %description -n libhcrypto4
This package contains the cryptographic library required for Heimdal. This package contains the cryptographic library required for Heimdal.
@ -93,7 +84,7 @@ This package contains the cryptographic library required for Heimdal.
%package -n libhdb9 %package -n libhdb9
Summary: Heimdal database backend library Summary: Heimdal database backend library
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libhdb9 %description -n libhdb9
libhdb provides the backend support for Heimdal kdc and kadmind. Its libhdb provides the backend support for Heimdal kdc and kadmind. Its
@ -106,7 +97,7 @@ Example of Heimdal backend are: Berkeley DB (BDB), NDB, LDAP.
%package -n libheimbase1 %package -n libheimbase1
Summary: Base library for Heimdal Kerberos Summary: Base library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libheimbase1 %description -n libheimbase1
This package contains the base library for Heimdal Kerberos. This package contains the base library for Heimdal Kerberos.
@ -114,7 +105,7 @@ This package contains the base library for Heimdal Kerberos.
%package -n libheimedit0 %package -n libheimedit0
Summary: libedit fork of the Heimdal Kerberos project Summary: libedit fork of the Heimdal Kerberos project
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libheimedit0 %description -n libheimedit0
libedit is a command line editing and history library. It is libedit is a command line editing and history library. It is
@ -124,7 +115,7 @@ to type commands at a terminal prompt.
%package -n libheimntlm0 %package -n libheimntlm0
Summary: NTLM implementation from Heimdal Kerberos Summary: NTLM implementation from Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libheimntlm0 %description -n libheimntlm0
This package contains the NTLM support library from and for Heimdal Kerberos. This package contains the NTLM support library from and for Heimdal Kerberos.
@ -132,7 +123,7 @@ This package contains the NTLM support library from and for Heimdal Kerberos.
%package -n libhx509-5 %package -n libhx509-5
Summary: X.509 implementation from Heimdal Kerberos Summary: X.509 implementation from Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libhx509-5 %description -n libhx509-5
This package contains the X.509 support library from and for Heimdal Kerberos. This package contains the X.509 support library from and for Heimdal Kerberos.
@ -140,7 +131,7 @@ This package contains the X.509 support library from and for Heimdal Kerberos.
%package -n libkadm5clnt7 %package -n libkadm5clnt7
Summary: Client library for Heimdal Kerberos Summary: Client library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libkadm5clnt7 %description -n libkadm5clnt7
This package contains the client library for Heimdal's kadmin program. This package contains the client library for Heimdal's kadmin program.
@ -148,7 +139,7 @@ This package contains the client library for Heimdal's kadmin program.
%package -n libkadm5srv8 %package -n libkadm5srv8
Summary: Server library for Heimdal Kerberos Summary: Server library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libkadm5srv8 %description -n libkadm5srv8
This package contains the server library for Heimdal's kadmin program. This package contains the server library for Heimdal's kadmin program.
@ -156,7 +147,7 @@ This package contains the server library for Heimdal's kadmin program.
%package -n libkafs0 %package -n libkafs0
Summary: KAFS support for Heimdal Kerberos Summary: KAFS support for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libkafs0 %description -n libkafs0
This package contains the library for supporting the in-kernel Andrew File System. This package contains the library for supporting the in-kernel Andrew File System.
@ -164,7 +155,7 @@ This package contains the library for supporting the in-kernel Andrew File Syste
%package -n libkdc2 %package -n libkdc2
Summary: Key Distribution Center library for Heimdal Kerberos Summary: Key Distribution Center library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libkdc2 %description -n libkdc2
This package contains the KDC support library. This package contains the KDC support library.
@ -172,7 +163,7 @@ This package contains the KDC support library.
%package -n libkrb5-26 %package -n libkrb5-26
Summary: Kerberos 5 API for Heimdal Kerberos Summary: Kerberos 5 API for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libkrb5-26 %description -n libkrb5-26
This package contains the Kerberos 5 library. This package contains the Kerberos 5 library.
@ -180,7 +171,7 @@ This package contains the Kerberos 5 library.
%package -n libotp0 %package -n libotp0
Summary: One Time Password library for Heimdal Kerberos Summary: One Time Password library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libotp0 %description -n libotp0
This package contains the library for One Time Password support. This package contains the library for One Time Password support.
@ -188,7 +179,7 @@ This package contains the library for One Time Password support.
%package -n libroken18 %package -n libroken18
Summary: OS abstraction library for Heimdal Kerberos Summary: OS abstraction library for Heimdal Kerberos
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libroken18 %description -n libroken18
This package contains a library that wraps or adds utility functions This package contains a library that wraps or adds utility functions
@ -197,7 +188,7 @@ missing from certain operating systems.
%package -n libsl0 %package -n libsl0
Summary: Implementation of a suggestion lister Summary: Implementation of a suggestion lister
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libsl0 %description -n libsl0
This package contains a library that suggests commands in a "did you This package contains a library that suggests commands in a "did you
@ -206,7 +197,7 @@ mean" fashion.
%package -n libwind0 %package -n libwind0
Summary: An implementation of RFC 3454 (stringprep) Summary: An implementation of RFC 3454 (stringprep)
Group: System/Libraries Group: System/Libraries
Conflicts: heimdal < %{version}-%{release} Conflicts: libheimdal < %{version}-%{release}
%description -n libwind0 %description -n libwind0
This package contains an implementation of the stringprep library. This package contains an implementation of the stringprep library.
@ -214,6 +205,8 @@ This package contains an implementation of the stringprep library.
%package devel %package devel
Summary: The Heimdal implementation of the Kerberos 5 protocol Summary: The Heimdal implementation of the Kerberos 5 protocol
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: db-devel >= 4.8
Requires: glibc-devel
Requires: libasn1-8 = %{version}-%{release} Requires: libasn1-8 = %{version}-%{release}
Requires: libgssapi3 = %{version}-%{release} Requires: libgssapi3 = %{version}-%{release}
Requires: libhcrypto4 = %{version}-%{release} Requires: libhcrypto4 = %{version}-%{release}
@ -231,22 +224,12 @@ Requires: libotp0 = %{version}-%{release}
Requires: libroken18 = %{version}-%{release} Requires: libroken18 = %{version}-%{release}
Requires: libsl0 = %{version}-%{release} Requires: libsl0 = %{version}-%{release}
Requires: libwind0 = %{version}-%{release} Requires: libwind0 = %{version}-%{release}
%if 0%{?sles_version} == 11
Requires: libcom_err-devel
Requires: sqlite3-devel
%else
Requires: pkgconfig(com_err) Requires: pkgconfig(com_err)
Requires: pkgconfig(sqlite3)
%endif
%if 0%{suse_version} > 1315
Requires: pkgconfig(ncurses) >= 5.3 Requires: pkgconfig(ncurses) >= 5.3
%else Requires: pkgconfig(sqlite3)
Requires: ncurses-devel >= 5.3
%endif
Requires: db-devel >= 4.8
Requires: glibc-devel
Conflicts: krb5-devel Conflicts: krb5-devel
Conflicts: krb5-mini-devel Conflicts: krb5-mini-devel
Conflicts: libheimdal < %{version}-%{release}
%description devel %description devel
Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written
@ -273,15 +256,42 @@ autoreconf -fi
%make_install %make_install
rm -rf %{buildroot}%{_libdir}/*.a rm -rf %{buildroot}%{_libdir}/*.a
rm -rf %{buildroot}%{_libdir}/*.la find %{buildroot} -type f -name "*.la" -delete -print
%post %post -p /sbin/ldconfig -n libasn1-8
%install_info --info-dir=%{_infodir} %{_infodir}/heimdal.info.gz %postun -p /sbin/ldconfig -n libasn1-8
%install_info --info-dir=%{_infodir} %{_infodir}/hx509.info.gz %post -p /sbin/ldconfig -n libgssapi3
%postun -p /sbin/ldconfig -n libgssapi3
%preun %post -p /sbin/ldconfig -n libhcrypto4
%install_info_delete --info-dir=%{_infodir} %{_infodir}/heimdal.info.gz %postun -p /sbin/ldconfig -n libhcrypto4
%install_info_delete --info-dir=%{_infodir} %{_infodir}/hx509.info.gz %post -p /sbin/ldconfig -n libhdb9
%postun -p /sbin/ldconfig -n libhdb9
%post -p /sbin/ldconfig -n libheimbase1
%postun -p /sbin/ldconfig -n libheimbase1
%post -p /sbin/ldconfig -n libheimedit0
%postun -p /sbin/ldconfig -n libheimedit0
%post -p /sbin/ldconfig -n libheimntlm0
%postun -p /sbin/ldconfig -n libheimntlm0
%post -p /sbin/ldconfig -n libhx509-5
%postun -p /sbin/ldconfig -n libhx509-5
%post -p /sbin/ldconfig -n libkadm5clnt7
%postun -p /sbin/ldconfig -n libkadm5clnt7
%post -p /sbin/ldconfig -n libkadm5srv8
%postun -p /sbin/ldconfig -n libkadm5srv8
%post -p /sbin/ldconfig -n libkafs0
%postun -p /sbin/ldconfig -n libkafs0
%post -p /sbin/ldconfig -n libkdc2
%postun -p /sbin/ldconfig -n libkdc2
%post -p /sbin/ldconfig -n libkrb5-26
%postun -p /sbin/ldconfig -n libkrb5-26
%post -p /sbin/ldconfig -n libotp0
%postun -p /sbin/ldconfig -n libotp0
%post -p /sbin/ldconfig -n libroken18
%postun -p /sbin/ldconfig -n libroken18
%post -p /sbin/ldconfig -n libsl0
%postun -p /sbin/ldconfig -n libsl0
%post -p /sbin/ldconfig -n libwind0
%postun -p /sbin/ldconfig -n libwind0
%files -n libasn1-8 %files -n libasn1-8
%{_libdir}/libasn1.so.8* %{_libdir}/libasn1.so.8*
@ -349,6 +359,6 @@ rm -rf %{buildroot}%{_libdir}/*.la
%dir %{_includedir}/roken %dir %{_includedir}/roken
%{_includedir}/roken/*.h %{_includedir}/roken/*.h
%{_libdir}/*.so %{_libdir}/*.so
%{_infodir}/*.info.gz %{_infodir}/*.info%{?ext_info}
%changelog %changelog