From 6ff69311078e1a065b96025c4b361f0d011a66cd Mon Sep 17 00:00:00 2001 From: Ralf Corsépius Date: Aug 21 2013 12:54:50 +0000 Subject: Reflect docdir changes (FTBFS, RHBZ#992258). --- diff --git a/ferm.spec b/ferm.spec index 48c25e2..4bb6efd 100644 --- a/ferm.spec +++ b/ferm.spec @@ -1,7 +1,7 @@ Summary: For Easy Rule Making Name: ferm Version: 2.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: GPLv2+ Source: http://ferm.foo-projects.org/download/2.1/%{name}-%{version}.tar.gz @@ -9,6 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://ferm.foo-projects.org/ BuildArchitectures: noarch +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + %description Ferm is a tool to maintain complex firewalls, without having the trouble to rewrite the complex rules over and over again. Ferm @@ -29,7 +31,7 @@ sed -i 's/DOCDIR = /#DOCDIR = /' config.mk %install rm -Rf $RPM_BUILD_ROOT -make install PREFIX=$RPM_BUILD_ROOT%{_prefix} DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 +make install PREFIX=$RPM_BUILD_ROOT%{_prefix} DOCDIR=$RPM_BUILD_ROOT%{_pkgdocdir} MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/ferm %changelog +* Wed Aug 21 2013 Ralf Corsépius - 2.1.2-4 +- Reflect docdir changes (FTBFS, RHBZ#992258). + * Sat Aug 03 2013 Fedora Release Engineering - 2.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild