From 4d2d0a8d2e7dffddb1430d3ad917a43b3c17a3d0 Mon Sep 17 00:00:00 2001 From: Scott Shambarger Date: Mon, 16 Dec 2024 10:28:57 -0800 Subject: [PATCH] Release 20241226 - SELinux and make dist fixes --- .gitignore | 1 + GNUmakefile | 4 ++-- NEWS.md | 6 ++++++ meson.build | 2 +- nmutils.spec | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5cd400e..b29e222 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.bak *.tgz *.tar.gz +*.rpm /test/run/ /test/results/ /selinux/nmutils.if diff --git a/GNUmakefile b/GNUmakefile index e07ad1b..cc4ef5e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -95,9 +95,9 @@ uninstall: build .PHONY: dist dist: clean $(VB)if [ -n "$$($(TAR) --version | grep GNU)" ]; then \ - $(TAR) czf "$(DIST)" --exclude "$(DIST)" --transform "s/^[.]/$(DISTDIR)/" ./*; \ + $(TAR) czf "$(DIST)" --exclude "$(DIST)" --transform "s/^[.]/$(DISTDIR)/S" ./* ./.gitignore; \ else \ - $(TAR) czf "$(DIST)" --exclude "$(DIST)" -s "/^[.]/$(DISTDIR)/" ./*; \ + $(TAR) czf "$(DIST)" --exclude "$(DIST)" -s "/^[.]/$(DISTDIR)/S" ./* ./.gitignore; \ fi @echo "Source tar created: $(DIST)" diff --git a/NEWS.md b/NEWS.md index 75c45c9..36f217e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +Overview of changes in nmutils-20241216 +======================================= + +- SELinux patch for dhclient pid file +- Correct make dist + Overview of changes in nmutils-20241215 ======================================= diff --git a/meson.build b/meson.build index 6ff3464..0f70eac 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ #meson setup --prefix=/usr -Dpkg=true build #meson install --destdir=destdir -C build -project('nmutils', version: '20241215', license: 'GPL-3.0-or-later', +project('nmutils', version: '20241216', license: 'GPL-3.0-or-later', default_options: [ 'sysconfdir=/etc' ], meson_version: '>=0.62.0') # test() verbose diff --git a/nmutils.spec b/nmutils.spec index 934931d..5daee7b 100644 --- a/nmutils.spec +++ b/nmutils.spec @@ -129,6 +129,9 @@ fi %endif %changelog +* Mon Dec 16 2024 Scott Shambarger 20241216-1 +- Release 20241216 + * Thu Nov 28 2024 Scott Shambarger 20241126-1 - Updated for meson build - Config for package now in /etc/nmutils