SPEC FILE CHANGE: Changed "%elseif" to "%else", "%if", and "%endif".

SPEC FILE CHANGE:  Specified '_unitdir' macro for non-'systemd' platforms.


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2238 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

5 files changed, 47 insertions, 9 deletions

diff --git a/pki/specs/dogtag-pki.spec b/pki/specs/dogtag-pki.spec
index 78c2c551a..afa2dbdf9 100644
--- a/pki/specs/dogtag-pki.spec
+++ b/pki/specs/dogtag-pki.spec
@@ -23,7 +23,8 @@ BuildArch:        noarch
 %define pki_tps_version            9.0.7
 %define pki_console_version        9.0.5
 %define tomcatjss_version          6.0.2
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 %define dogtag_pki_theme_version   9.0.0
 %define esc_version                1.1.0
 %define jss_version                4.2.6-17
@@ -50,6 +51,7 @@ BuildArch:        noarch
 %define pki_console_version        9.0.0
 %define tomcatjss_version          2.0.0
 %endif
+%endif
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index e21d02b04..750f61047 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -8,6 +8,11 @@ Group:            System Environment/Daemons
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# specify '_unitdir' macro for platforms that don't use 'systemd'
+%if 0%{?rhel} || 0%{?fedora} < 15
+%define           _unitdir /lib/systemd/system
+%endif
+
 # tomcatjss requires versioning since version 2.0.0 requires tomcat6
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
@@ -27,7 +32,8 @@ BuildRequires:    jss >= 4.2.6-19.1
 BuildRequires:    osutil >= 2.0.2
 BuildRequires:    systemd-units
 BuildRequires:    tomcatjss >= 6.0.2
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 BuildRequires:    jpackage-utils
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    osutil >= 2.0.1
@@ -38,6 +44,7 @@ BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    osutil
 BuildRequires:    tomcatjss >= 2.0.0
 %endif
+%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
@@ -177,7 +184,8 @@ Requires:         ldapjdk
 Requires:         jpackage-utils >= 0:1.7.5-10
 Requires:         jss >= 4.2.6-19.1
 Requires:         osutil >= 2.0.2
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires:         jpackage-utils
 Requires:         jss >= 4.2.6-17
 Requires:         osutil >= 2.0.1
@@ -186,6 +194,7 @@ Requires:         jpackage-utils
 Requires:         jss >= 4.2.6-17
 Requires:         osutil
 %endif
+%endif
 
 %description -n   pki-util
 The PKI Utility Framework is required by the following four PKI subsystems:
@@ -282,12 +291,14 @@ Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         jss >= 4.2.6-19.1
 Requires:         tomcatjss >= 6.0.2
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         jss >= 4.2.6-17
 Requires:         tomcatjss >= 6.0.0
-%elseif 0%{?fedora} >= 14
+%else
+%if 0%{?fedora} >= 14
 Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         jss >= 4.2.6-17
@@ -298,6 +309,8 @@ Requires:         jakarta-commons-logging
 Requires:         jss >= 4.2.6-17
 Requires:         tomcatjss >= 2.0.0
 %endif
+%endif
+%endif
 
 %description -n   pki-common
 The PKI Common Framework is required by the following four PKI subsystems:
@@ -360,7 +373,8 @@ Requires:         pki-selinux = %{version}-%{release}
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
@@ -377,6 +391,7 @@ Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
 %endif
+%endif
 
 %description -n   pki-ca
 The Certificate Authority (CA) is a required PKI subsystem which issues,
diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec
index 41c02e762..77d17fc60 100644
--- a/pki/specs/pki-kra.spec
+++ b/pki/specs/pki-kra.spec
@@ -10,6 +10,11 @@ BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# specify '_unitdir' macro for platforms that don't use 'systemd'
+%if 0%{?rhel} || 0%{?fedora} < 15
+%define           _unitdir /lib/systemd/system
+%endif
+
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    nspr-devel
@@ -35,7 +40,8 @@ Requires:         pki-selinux >= 9.0.15
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires:         pki-common
 Requires:         pki-selinux
 Requires(post):   chkconfig
@@ -56,6 +62,7 @@ Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
 %endif
+%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec
index b2f244500..876127849 100644
--- a/pki/specs/pki-ocsp.spec
+++ b/pki/specs/pki-ocsp.spec
@@ -10,6 +10,11 @@ BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# specify '_unitdir' macro for platforms that don't use 'systemd'
+%if 0%{?rhel} || 0%{?fedora} < 15
+%define           _unitdir /lib/systemd/system
+%endif
+
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    nspr-devel
@@ -35,7 +40,8 @@ Requires:         pki-selinux >= 9.0.15
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires:         pki-common
 Requires:         pki-selinux
 Requires(post):   chkconfig
@@ -56,6 +62,7 @@ Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
 %endif
+%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec
index eb0999280..56642e481 100644
--- a/pki/specs/pki-tks.spec
+++ b/pki/specs/pki-tks.spec
@@ -10,6 +10,11 @@ BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# specify '_unitdir' macro for platforms that don't use 'systemd'
+%if 0%{?rhel} || 0%{?fedora} < 15
+%define           _unitdir /lib/systemd/system
+%endif
+
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    nspr-devel
@@ -35,7 +40,8 @@ Requires:         pki-selinux >= 9.0.15
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
-%elseif 0%{?fedora} >= 15
+%else
+%if 0%{?fedora} >= 15
 Requires:         pki-common
 Requires:         pki-selinux
 Requires(post):   chkconfig
@@ -56,6 +62,7 @@ Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
 %endif
+%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz