From 8b92a52a7e50e3ef4b3005de4d9aaa44b3efcd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Wed, 13 Nov 2024 10:56:21 +0100 Subject: [PATCH] SPEC - Fix/modernize spec file --- .copr/Makefile | 1 - rpm/dnscap.spec | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.copr/Makefile b/.copr/Makefile index 919eb2b0..29ed0bc1 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -15,7 +15,6 @@ $(top)/rpmbuild: mkdir -p "$(top)"/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} srpm: prereq update-dist-tools - git config --global safe.directory "*" test -f .gitmodules && git submodule update --init || true echo "$(spec)" | grep -q "develop.spec" && auto_build_number=`date --utc +%s` message="Auto build `date --utc --iso-8601=seconds`" "$(top)/dist-tools/spec-new-changelog-entry" || true overwrite=yes nosign=yes "$(top)/dist-tools/create-source-packages" rpm diff --git a/rpm/dnscap.spec b/rpm/dnscap.spec index ebbcad8b..d5b576f9 100644 --- a/rpm/dnscap.spec +++ b/rpm/dnscap.spec @@ -8,7 +8,7 @@ License: BSD-3-Clause URL: https://www.dns-oarc.net/tools/dnscap # Source needs to be generated by dist-tools/create-source-packages, see # https://github.com/jelu/dist-tools -Source0: https://www.dns-oarc.net/files/dnscap/%{name}-%{version}.tar.gz?/%{name}_%{version}.orig.tar.gz +Source0: %{name}_%{version}.orig.tar.gz BuildRequires: libpcap-devel BuildRequires: ldns-devel @@ -35,24 +35,18 @@ to DNS transactions and protocol options. %build sh autogen.sh %configure -make %{?_smp_mflags} - - -%check -make test +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install -%clean -rm -rf $RPM_BUILD_ROOT +%check +%make_build test %files -%defattr(-,root,root) %{_bindir}/* %{_datadir}/doc/* %{_mandir}/man1/*