diff --git a/font-util.changes b/font-util.changes index 1e4d553..5acfafc 100644 --- a/font-util.changes +++ b/font-util.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 8 11:06:29 UTC 2019 - Dominique Leuenberger + +- Own %{_datadir}/aclocal: when we might switch to pkgconf instead + of pkg-config, nothing in the build root is 'accidentally' owning + this directory for us. + ------------------------------------------------------------------- Wed Feb 8 21:14:19 UTC 2017 - mstaudt@suse.com diff --git a/font-util.spec b/font-util.spec index 0e5164d..0403f1c 100644 --- a/font-util.spec +++ b/font-util.spec @@ -1,7 +1,7 @@ # # spec file for package font-util # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ Release: 0 Summary: X.Org font package creation/installation utilities License: MIT Group: System/X11/Fonts -Url: http://xorg.freedesktop.org/ +URL: https://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/archive/individual/font/%{name}-%{version}.tar.bz2 Source1: http://xorg.freedesktop.org/archive/individual/font/%{name}-%{version}.tar.bz2.sig Source2: %{name}.keyring @@ -34,7 +34,6 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.8 # X11R7.7 is in RC1, and xorg-x11-fonts-devel was version 7.6 Provides: xorg-x11-fonts-devel = 7.7 Obsoletes: xorg-x11-fonts-devel < 7.7 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides utilities for X.Org font package @@ -52,12 +51,13 @@ cp %{SOURCE3} map-JISX0201.1976-0 %make_install %files -%defattr(-,root,root) -%doc ChangeLog COPYING README +%license COPYING +%doc ChangeLog README %{_bindir}/bdftruncate %{_bindir}/ucs2any %{_mandir}/man1/bdftruncate.1%{?ext_man} %{_mandir}/man1/ucs2any.1%{?ext_man} +%dir %{_datadir}/aclocal %{_datadir}/aclocal/fontutil.m4 %{_datadir}/fonts/util/ %{_libdir}/pkgconfig/fontutil.pc