- Version bump to match latest upstream

- Cleanups in the specfile due to changes in the upstream package

netlabel_tools.spec

@@ -1,58 +1,66 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
-Version: 0.19
-Release: 12%{?dist}
+Version: 0.20
+Release: 0%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://netlabel.sf.net/
 Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz
-Source1: netlabel
-Source2: netlabel.rules
-Patch1: netlabel_tools-0.17-new-hdrs.patch
-Patch2: netlabel_tools-0.19-return_codes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}
-BuildRequires: kernel-headers >= 2.6.18
+Requires: kernel >= 2.6.19
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: kernel-headers >= 2.6.19
 BuildRequires: libnl-devel
+BuildRequires: doxygen
+BuildRequires: systemd
 
 %description
 NetLabel is a kernel subsystem which implements explicit packet labeling
-protocols such as CIPSO and RIPSO for Linux.  Packet labeling is used in
-secure networks to mark packets with the security attributes of the data they
-contain.  This package provides the necessary user space tools to query and
-configure the kernel subsystem.
+protocols such as CIPSO for Linux.  Packet labeling is used in secure networks
+to mark packets with the security attributes of the data they contain.  This
+package provides the necessary user space tools to query and configure the
+kernel subsystem.
 
-%prep 
-%setup -q -n %{name}-%{version}
-
-# Build fixes.
-%patch1 -p1 -b .new-hdrs
-%patch2 -p1 -b .rc
+%prep
+%setup -q
 
 %build
-# Don't use _smp_mflags, it's small and a hand crafted Makefile
-make
+./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd
+make V=1 %{?_smp_mflags}
 
 %install
-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/
+rm -rf "%{buildroot}"
+mkdir -p "%{buildroot}/etc"
+mkdir -p "%{buildroot}/%{_sbindir}"
+mkdir -p "%{buildroot}/%{_unitdir}"
+mkdir -p "%{buildroot}/%{_mandir}"
+make V=1 DESTDIR="%{buildroot}" install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%preun
+%systemd_preun netlabel.service
+
+%postun
+%systemd_postun
+
+%post
+%systemd_post netlabel.service
 
 %files
 %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
+%doc README CHANGELOG LICENSE
 %attr(0644,root,root) %{_mandir}/man8/*
+%attr(0755,root,root) %{_sbindir}/netlabelctl
+%attr(0755,root,root) %{_sbindir}/netlabel-config
+%attr(0644,root,root) %{_unitdir}/netlabel.service
+%attr(0644,root,root) %config(noreplace) /etc/netlabel.rules
 
 %changelog
+* Mon Jun 3 2013 Paul Moore <pmoore@redhat.com> - 0.20-0
+- Version bump to match latest upstream
+- Cleanups in the specfile due to changes in the upstream package
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild