From 2b9bef454eaef909b8df2099e8e877e404d34c393530200d1d82db2b5fbe628c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 13 Mar 2021 12:14:00 +0000 Subject: [PATCH] Accepting request 878664 from home:dirkmueller:Factory - modernize spec file (move license to licensedir) OBS-URL: https://build.opensuse.org/request/show/878664 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/mkfontscale?expand=0&rev=21 --- mkfontscale.changes | 5 +++++ mkfontscale.spec | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mkfontscale.changes b/mkfontscale.changes index fa317b9..e48bb62 100644 --- a/mkfontscale.changes +++ b/mkfontscale.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 12 23:14:34 UTC 2021 - Dirk Müller + +- modernize spec file (move license to licensedir) + ------------------------------------------------------------------- Fri Mar 22 12:57:52 UTC 2019 - Stefan Dirsch diff --git a/mkfontscale.spec b/mkfontscale.spec index 19d70f7..ee23e17 100644 --- a/mkfontscale.spec +++ b/mkfontscale.spec @@ -1,7 +1,7 @@ # # spec file for package mkfontscale # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # 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,20 +22,19 @@ Release: 0 Summary: Utility to create index of scalable font files for X License: MIT Group: System/X11/Utilities -Url: http://xorg.freedesktop.org/ -Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 -BuildRequires: pkg-config +URL: https://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 +BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: pkgconfig(fontenc) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.25 +Recommends: xorg-x11-fonts-core # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 -Recommends: xorg-x11-fonts-core Provides: mkfontdir = 1.0.7 Obsoletes: mkfontdir <= 1.0.7 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description mkfontscale creates the fonts.scale and fonts.dir index files used by the @@ -46,14 +45,14 @@ legacy X11 font system. %build %configure -make %{?_smp_mflags} +%make_build %install %make_install %files -%defattr(-,root,root) -%doc ChangeLog COPYING README.md +%license COPYING +%doc ChangeLog README.md %{_bindir}/mkfontdir %{_bindir}/mkfontscale %{_mandir}/man1/mkfontdir.1%{?ext_man}