From d4f2ea5c5a30a77bf9314e9718b06e6bf8761c74 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 11 Jan 2012 10:57:43 +0100 Subject: [PATCH] Remove docs --- bacula.spec | 44 +++++--------------------------------------- sources | 1 - 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/bacula.spec b/bacula.spec index fbee76a..425ff12 100644 --- a/bacula.spec +++ b/bacula.spec @@ -1,10 +1,9 @@ %global uid 133 %global username bacula -%global docs 1 Name: bacula Version: 5.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: GPLv2 with exceptions @@ -13,7 +12,6 @@ URL: http://www.bacula.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.bacula.org/downloads/Bacula-%{version}/%{name}-%{version}.tar.gz -Source1: http://www.bacula.org/downloads/Bacula-%{version}/%{name}-docs-%{version}.tar.bz2 Source5: README.Fedora Source6: bacula.logrotate Source7: bacula-fd.init @@ -245,22 +243,6 @@ This package contains the Gnome and KDE compatible tray monitor to monitor your bacula server. %endif -%if 0%{?docs} -%package docs -Summary: Bacula documentation -Group: Documentation -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -BuildArch: noarch -%endif - -%description docs -Bacula is a set of programs that allow you to manage the backup, -recovery, and verification of computer data across a network of -different computers. It is based on a client/server architecture. - -This package contains the documentation for most of the bacula-packages. -%endif - %package devel Summary: Bacula development files @@ -283,7 +265,7 @@ Provides check_bacula support for Nagios. %prep -%setup -q -a 1 +%setup -q %patch1 -p1 -b .hostname %patch2 -p2 -b .openssl %patch3 -p1 -b .queryfile @@ -365,19 +347,6 @@ pushd src/qt-console/tray-monitor popd %endif -%if 0%{?docs} -# Build the docs -pushd bacula-docs-%{version} - %configure --with-bacula=%{_builddir}/bacula-%{version} - %{__make} -popd -for manual in problems console utility developers main misc; do - mkdir $manual - cp -f bacula-docs-%{version}/manuals/en/$manual/$manual/*.{css,html,png} $manual - cp -f bacula-docs-%{version}/manuals/en/$manual/$manual.pdf . -done -%endif - cp %{SOURCE5} . %install @@ -807,12 +776,6 @@ fi %{_datadir}/pixmaps/bacula-tray-monitor.png %endif -%if 0%{?docs} -%files docs -%defattr(-,root,root,-) -%doc problems* console* utility* developers* main* misc* -%endif - %files devel %defattr(-,root,root,-) %{_includedir}/bacula @@ -832,6 +795,9 @@ fi %changelog +* Wed Jan 11 2012 Simone Caronni - 5.2.3-7 +- Split off bacula-docs subpackage. + * Thu Jan 05 2012 Simone Caronni - 5.2.3-6 - Make docs conditional at build for testing. - Add devel subpackage. diff --git a/sources b/sources index 29311f8..dcd0da8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 43e41c3f88e7ba86d0dd248935ce2f00 bacula-5.2.3.tar.gz -1dc74dbed0f9d454d2863b543153ddc1 bacula-docs-5.2.3.tar.bz2