diff --git a/netlabel_tools-0.17-new-hdrs.patch b/netlabel_tools-0.17-new-hdrs.patch index cd4dbdd..911053c 100644 --- a/netlabel_tools-0.17-new-hdrs.patch +++ b/netlabel_tools-0.17-new-hdrs.patch @@ -1,5 +1,6 @@ ---- netlabel_tools-0.16-orig/Makefile 2006-06-27 13:06:28.000000000 -0400 -+++ netlabel_tools-0.16/Makefile 2006-08-29 16:42:09.000000000 -0400 +diff -up netlabel_tools-0.17/Makefile.orig netlabel_tools-0.17/Makefile +--- netlabel_tools-0.17/Makefile.orig 2006-09-28 18:18:05.000000000 -0400 ++++ netlabel_tools-0.17/Makefile 2008-08-11 14:57:31.000000000 -0400 @@ -43,8 +43,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi INSTALL_BIN_DIR = $(INSTALL_PREFIX)/bin INSTALL_MAN_DIR = $(INSTALL_PREFIX)/share/man @@ -7,12 +8,12 @@ -OWNER = root -GROUP = root +# Mock doesn't allow this. -+#OWNER = root -+#GROUP = root ++# OWNER = root ++# GROUP = root # # targets -@@ -77,9 +78,9 @@ install: $(SUBDIRS) +@@ -72,9 +73,9 @@ install: $(SUBDIRS) @echo "INFO: installing files in $(INSTALL_PREFIX)" @mkdir -p $(INSTALL_SBIN_DIR) @mkdir -p $(INSTALL_MAN_DIR)/man8 @@ -23,4 +24,4 @@ + @install -m 644 docs/man/netlabelctl.8 \ $(INSTALL_MAN_DIR)/man8 - clean: + $(VERSION_HDR): version_info diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 5526d61..3a8a4bd 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,8 +1,8 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.17 -Release: 7%{?dist} -License: GPL +Release: 8%{?dist} +License: GPLv2+ Group: System Environment/Daemons URL: http://netlabel.sf.net/ Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Mon Aug 11 2008 Tom "spot" Callaway - 0.17-8 +- fix license tag + * Mon Feb 11 2008 Steve Conklin - 0.17-7 - New patch for bz#431766 to resolve conflicts