From: Tomas Krizek Date: Mon, 23 Apr 2018 14:05:36 +0000 (+0200) Subject: distro/rpm: reformat spec file X-Git-Tag: v2.4.0~31^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66b95f232aa5a0c15700f8ddd5bc395d9931612e;p=thirdparty%2Fknot-resolver.git distro/rpm: reformat spec file --- diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec index b5b8ba31e..34064f6cc 100644 --- a/distro/rpm/knot-resolver.spec +++ b/distro/rpm/knot-resolver.spec @@ -16,9 +16,9 @@ Source0: knot-resolver_%{version}.orig.tar.xz # LuaJIT only on these arches %if 0%{?rhel} # RHEL 7 does not have aarch64 LuaJIT -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 %else -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %endif Source2: kresd.conf @@ -29,26 +29,32 @@ Source1: knot-resolver-%{version}.tar.xz.asc # PGP keys used to sign upstream releases # Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures # Don't forget to update %%prep section when adding/removing keys -Source100: gpgkey-B6006460B60A80E782062449E747DF1F9575A3AA.gpg.asc -Source101: gpgkey-BE26EBB9CBE059B3910CA35BCE8DD6A1A50A21E4.gpg.asc -Source102: gpgkey-4A8BA48C2AED933BD495C509A1FBA5F7EF8C4869.gpg.asc +Source100: gpgkey-B6006460B60A80E782062449E747DF1F9575A3AA.gpg.asc +Source101: gpgkey-BE26EBB9CBE059B3910CA35BCE8DD6A1A50A21E4.gpg.asc +Source102: gpgkey-4A8BA48C2AED933BD495C509A1FBA5F7EF8C4869.gpg.asc BuildRequires: gnupg2 %endif +BuildRequires: pkgconfig(cmocka) +BuildRequires: pkgconfig(hiredis) +BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libknot) >= 2.6.4 BuildRequires: pkgconfig(libzscanner) >= 2.4.2 BuildRequires: pkgconfig(libdnssec) >= 2.3.1 -BuildRequires: pkgconfig(libuv) -BuildRequires: pkgconfig(luajit) >= 2.0 - -BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libmemcached) >= 1.0 -BuildRequires: pkgconfig(hiredis) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libuv) +BuildRequires: pkgconfig(luajit) >= 2.0 +BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(cmocka) - -BuildRequires: systemd +# Lua 5.1 version of the libraries have different package names +%if 0%{?rhel} +Requires: lua-socket +Requires: lua-sec +%else +Requires: lua-socket-compat +Requires: lua-sec-compat +%endif %if 0%{?fedora} # dependencies for doc package; disable in EPEL (missing fonts) @@ -59,19 +65,10 @@ BuildRequires: python2-sphinx BuildRequires: python2-sphinx_rtd_theme %endif -# Lua 5.1 version of the libraries have different package names -%if 0%{?rhel} -Requires: lua-socket -Requires: lua-sec -%else -Requires: lua-socket-compat -Requires: lua-sec-compat -%endif - -Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(pre): shadow-utils +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description The Knot DNS Resolver is a caching full resolver implementation written in C