From b933eda862655da90ff504e1ae42d72139e78259 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev (aka Pahan-Hubbitus) Date: Jan 06 2014 19:47:56 +0000 Subject: - Update to 2.2 (bz#1045607) - Add .service file. - Clear some quirks. --- diff --git a/.gitignore b/.gitignore index 11c576e..0bfcbd7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ferm-2.0.7.tar.gz /ferm-2.1.tar.gz /ferm-2.1.1.tar.gz /ferm-2.1.2.tar.gz +/ferm-2.2.tar.gz diff --git a/ferm.spec b/ferm.spec index 4bb6efd..ba6aaf9 100644 --- a/ferm.spec +++ b/ferm.spec @@ -1,7 +1,7 @@ Summary: For Easy Rule Making Name: ferm -Version: 2.1.2 -Release: 4%{?dist} +Version: 2.2 +Release: 1%{?dist} Group: Applications/System License: GPLv2+ Source: http://ferm.foo-projects.org/download/2.1/%{name}-%{version}.tar.gz @@ -9,6 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://ferm.foo-projects.org/ BuildArchitectures: noarch +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %description @@ -22,10 +27,6 @@ levels and lists. %prep %setup -q -sed -i 's/PREFIX = /#PREFIX = /' config.mk -sed -i 's/MANDIR = /#MANDIR = /' config.mk -sed -i 's/DOCDIR = /#DOCDIR = /' config.mk - %build %install @@ -36,15 +37,29 @@ make install PREFIX=$RPM_BUILD_ROOT%{_prefix} DOCDIR=$RPM_BUILD_ROOT%{_pkgdocdir %clean rm -rf $RPM_BUILD_ROOT +%post +%systemd_post %{name}.service + +%preun +%systemd_preun %{name}.service + +%postun +%systemd_postun + %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO NEWS examples/ %{_mandir}/man1/* - +%{_unitdir}/%{name}.service %{_sbindir}/import-ferm %{_sbindir}/ferm %changelog +* Mon Jan 6 2014 Pavel Alexeev - 2.2-1 +- Update to 2.2 (bz#1045607) +- Add .service file. +- Clear some quirks. + * Wed Aug 21 2013 Ralf Corsépius - 2.1.2-4 - Reflect docdir changes (FTBFS, RHBZ#992258). diff --git a/sources b/sources index b6ae838..f18ddb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcfeae169c4e8e9a702df19f453605ed ferm-2.1.2.tar.gz +f2d6e6950d90c768ef9e1f055a01fba2 ferm-2.2.tar.gz