rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

UnversionedDocdirs, take two

Browse Source 
- take another stab at accounting for UnversionedDocdirs for the -libs
  subpackage (spotted by ssorce)
This commit is contained in:
Nalin Dahyabhai 2013-08-23 14:08:59 -04:00
parent 6c46043c16
commit c3f5bd1fb8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
krb5.spec
View File

@ -26,13 +26,13 @@
%endif %endif
# Set this so that find-lang.sh will recognize the .po files. # Set this so that find-lang.sh will recognize the .po files.
%global gettext_domain mit-krb5 %global gettext_domain mit-krb5
# If we're not being told where *our* docs go, make a guess. # Guess where the -libs subpackage's docs are going to go.
%global pkgdocdir %{?_pkgdocdir:%{_pkgdocdir}-libs}%{!?_pkgdocdir:%{_docdir}/%{name}-libs-%{version}} %define libsdocdir %{?_pkgdocdir:%(echo %{_pkgdocdir} | sed -e s,krb5,krb5-libs,g)}%{!?_pkgdocdir:%{_docdir}/%{name}-libs-%{version}}
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.11.3 Version: 1.11.3
Release: 8%{?dist} Release: 9%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead? # Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -105,7 +105,7 @@ License: MIT
URL: http://web.mit.edu/kerberos/www/ URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, bison, flex, gawk, gettext BuildRequires: autoconf, bison, flex, gawk, gettext, sed
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
BuildRequires: libcom_err-devel, libss-devel BuildRequires: libcom_err-devel, libss-devel
%endif %endif
@ -568,7 +568,7 @@ install -pdm 755 $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/kdb
install -pdm 755 $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/authdata install -pdm 755 $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/authdata
# The rest of the binaries, headers, libraries, and docs. # The rest of the binaries, headers, libraries, and docs.
make -C src DESTDIR=$RPM_BUILD_ROOT EXAMPLEDIR=%{pkgdocdir}/examples install make -C src DESTDIR=$RPM_BUILD_ROOT EXAMPLEDIR=%{libsdocdir}/examples install
# Munge krb5-config yet again. This is totally wrong for 64-bit, but chunks # Munge krb5-config yet again. This is totally wrong for 64-bit, but chunks
# of the buildconf patch already conspire to strip out /usr/<anything> from the # of the buildconf patch already conspire to strip out /usr/<anything> from the
@ -911,6 +911,10 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Fri Aug 23 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-9
- take another stab at accounting for UnversionedDocdirs for the -libs
subpackage (spotted by ssorce)
* Thu Aug 15 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-8 * Thu Aug 15 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.3-8
- drop a patch we weren't not applying (build tooling) - drop a patch we weren't not applying (build tooling)
- wrap kadmind and kpropd in scripts which check for the presence/absence - wrap kadmind and kpropd in scripts which check for the presence/absence