From 41e8cbc39f4c1025aa3f68ea5dcf470fb4e971a2 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 5 Feb 2011 12:57:15 +0100 Subject: [PATCH] Add patch from bug #1574 for Scientific Linux spec --- .../platforms/{rpm => rpms}/bacula-bat.spec | 0 .../platforms/{rpm => rpms}/bacula-docs.spec | 0 .../platforms/{rpm => rpms}/bacula-mtx.spec | 0 bacula/platforms/{rpm => rpms}/bacula.spec | 25 ++++++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) rename bacula/platforms/{rpm => rpms}/bacula-bat.spec (100%) rename bacula/platforms/{rpm => rpms}/bacula-docs.spec (100%) rename bacula/platforms/{rpm => rpms}/bacula-mtx.spec (100%) rename bacula/platforms/{rpm => rpms}/bacula.spec (98%) diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpms/bacula-bat.spec similarity index 100% rename from bacula/platforms/rpm/bacula-bat.spec rename to bacula/platforms/rpms/bacula-bat.spec diff --git a/bacula/platforms/rpm/bacula-docs.spec b/bacula/platforms/rpms/bacula-docs.spec similarity index 100% rename from bacula/platforms/rpm/bacula-docs.spec rename to bacula/platforms/rpms/bacula-docs.spec diff --git a/bacula/platforms/rpm/bacula-mtx.spec b/bacula/platforms/rpms/bacula-mtx.spec similarity index 100% rename from bacula/platforms/rpm/bacula-mtx.spec rename to bacula/platforms/rpms/bacula-mtx.spec diff --git a/bacula/platforms/rpm/bacula.spec b/bacula/platforms/rpms/bacula.spec similarity index 98% rename from bacula/platforms/rpm/bacula.spec rename to bacula/platforms/rpms/bacula.spec index 201370f526..c58218f2cc 100644 --- a/bacula/platforms/rpm/bacula.spec +++ b/bacula/platforms/rpms/bacula.spec @@ -1,6 +1,6 @@ # Bacula RPM spec file # -# Copyright (C) 2000-2010 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2011 Free Software Foundation Europe e.V. # Platform Build Configuration @@ -89,6 +89,10 @@ #Mandriva 2006 %if 0%{?mandriva_version} == 2006 #Mandriva 2007 %if 0%{?mandriva_version} == 2007 #Mandriva 2008 %if 0%{?mandriva_version} == 2008 +#SCIENTIFIC LINUX 3 %if 0%{?sl_version} == 3 +#SCIENTIFIC LINUX 4 %if 0%{?sl_version} == 4 +#SCIENTIFIC LINUX 5 %if 0%{?sl_version} == 5 + %if 0%{?opensuse_bs} @@ -210,6 +214,25 @@ BuildRequires: suse-release %define _dist "SLES 11" %endif ++%if 0%{?sl_version} == 3 ++%define build_sl3 ++%define _dist "Scientific Linux release 3" ++BuildRequires: fedora-release ++%endif ++ ++%if 0%{?sl_version} == 4 ++%define build_sl4 ++%define _dist "Scientific Linux release 4" ++BuildRequires: fedora-release ++%endif ++ ++%if 0%{?sl_version} == 5 ++%define build_sl5 ++%define _dist "Scientific Linux release 5" ++BuildRequires: fedora-release ++%endif + + %endif # opensuse-bs? -- 2.39.2