- Add upstream patch.

netlabel_tools.spec

@@ -4,14 +4,18 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
 Source0: %{home_base_url}/%{name}-%{version}.tar.gz
-Patch: netlabel_tools-0.17-new-hdrs.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers, libnl-devel
+Source1: netlabel
+Source2: netlabel.rules
+Patch1: netlabel_tools-0.17-new-hdrs.patch
+Patch2: netlabel_tools-27_28.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: kernel-headers >= 2.6.18
+BuildRequires: libnl-devel
 
 %description
 NetLabel is a kernel subsystem which implements explicit packet labeling
@@ -23,7 +27,10 @@ configure the kernel subsystem.
 %prep 
 %setup -q -n %{name}-%{version}
 
-%patch -p1
+# Build fixes.
+%patch1 -p1
+# Upstream patch.
+%patch2 -p1
 
 %build
 # Don't use _smp_mflags, it's small and a hand crafted Makefile
@@ -34,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 make INSTALL_PREFIX=${RPM_BUILD_ROOT} \
      INSTALL_MAN_DIR=${RPM_BUILD_ROOT}/usr/share/man \
      install
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/etc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,9 +52,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc docs/*.txt
 %attr(0755,root,root) /sbin/*
+%attr(0755,root,root) /etc/rc.d/init.d/netlabel
+%config(noreplace) %attr(640,root,root) /etc/netlabel.rules
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Mon Oct 16 2006 James Antill <james@and.org> - 0.17-3
+- Add upstream patch.
+
+* Sat Oct 14 2006 Steve Grubb <sgrubb@redhat.com> - 0.17-3
+- Add init scripts and default rules
+
 * Sun Oct  1 2006 James Antill <james@and.org> - 0.17-2
 - Upgrade to latest upstream.