summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2012-03-02 19:30:19 -0800
committerMatthew Harmsen <mharmsen@redhat.com>2012-03-02 19:30:19 -0800
commitea1bbcfb01ca2a1b4d6f0ac83ba7662c0a576a05 (patch)
treefa14f4194e36d55cbf19db6ee98eea33f161882f
parentb5219f534cf0b60452346b31a84b9eddd881f614 (diff)
downloadpki-ea1bbcfb01ca2a1b4d6f0ac83ba7662c0a576a05.tar.gz
pki-ea1bbcfb01ca2a1b4d6f0ac83ba7662c0a576a05.tar.xz
pki-ea1bbcfb01ca2a1b4d6f0ac83ba7662c0a576a05.zip
Remove platform specific logic from patches for mock purposes.
-rw-r--r--pki/specs/pki-core.spec18
1 files changed, 9 insertions, 9 deletions
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index b83171ff6..c828fdcda 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}6%{?prerel}%{?dist}
+Release: %{?relprefix}7%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -68,13 +68,8 @@ BuildRequires: tomcatjss >= 2.0.0
Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-%if 0%{?fedora} >= 17
-Patch0: %{name}-selinux-f17.patch
-%else
-%if 0%{?fedora} >= 16
Patch0: %{name}-selinux-f16.patch
-%endif
-%endif
+Patch1: %{name}-selinux-f17.patch
%if 0%{?rhel}
ExcludeArch: ppc ppc64 s390 s390x
@@ -687,10 +682,10 @@ This package is a part of the PKI Core used by the Certificate System.
%setup -q -n %{name}-%{version}%{?prerel}
%if 0%{?fedora} >= 17
-%patch0 -p2 -b .p0
+%patch0 -p2 -b .f17
%else
%if 0%{?fedora} >= 16
-%patch0 -p2 -b .p0
+%patch0 -p2 -b .f16
%endif
%endif
@@ -1294,6 +1289,11 @@ fi
%changelog
+* Fri Mar 2 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.7.a1
+- For 'mock' purposes, removed platform-specific logic from around
+ the 'patch' files so that ALL 'patch' files will be included in
+ the SRPM.
+
* Wed Feb 29 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.6.a1
- Removed dependency on OSUtil.