From ef580302d5d02a5dd269717182696f8b92d1cac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Tue, 12 Nov 2024 16:52:05 +0100 Subject: [PATCH] SPEC - Fix/modernize spec file --- .copr/Makefile | 1 - rpm/packetq.spec | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.copr/Makefile b/.copr/Makefile index 919eb2b..29ed0bc 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/packetq.spec b/rpm/packetq.spec index c26e35e..4d90c64 100644 --- a/rpm/packetq.spec +++ b/rpm/packetq.spec @@ -8,7 +8,7 @@ License: GPL-3.0 URL: https://github.com/DNS-OARC/PacketQ # Source needs to be generated by dist-tools/create-source-packages, see # https://github.com/jelu/dist-tools -Source0: https://github.com/DNS-OARC/PacketQ/archive/v%{version}.tar.gz?/%{name}_%{version}.orig.tar.gz +Source0: %{name}_%{version}.orig.tar.gz BuildRequires: zlib-devel BuildRequires: autoconf @@ -33,24 +33,18 @@ it was rebuilt and could handle protocols other than DNS among other things. %build sh autogen.sh %configure -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %check -make test - - -%clean -rm -rf $RPM_BUILD_ROOT +%make_build test %files -%defattr(-,root,root) %{_bindir}/* %{_datadir}/doc/*