diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-08-16 14:15:48 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-16 14:15:48 -0400 |
| commit | eb8fa13827279abf9d537a2ff2eb9dae58fba526 (patch) | |
| tree | 83dcd7154df6f7c0b41a2d695c7b5cc7f8c2395d /specs | |
| parent | 0b8e4d2262f1b5a8956b5b3ef000981156785bd4 (diff) | |
| download | pki-eb8fa13827279abf9d537a2ff2eb9dae58fba526.tar.gz pki-eb8fa13827279abf9d537a2ff2eb9dae58fba526.tar.xz pki-eb8fa13827279abf9d537a2ff2eb9dae58fba526.zip | |
Fixed TPS installation problem.
The Conflicts tags in pki-tps and pki-tps-tomcat have been removed
since it blocks the installation.
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 1 | ||||
| -rw-r--r-- | specs/pki-tps.spec | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 3bf959da5..a2f6f0135 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -486,7 +486,6 @@ Group: System Environment/Daemons BuildArch: noarch Provides: pki-tps -Conflicts: pki-tps Requires: java >= 1:1.7.0 Requires: pki-server = %{version}-%{release} Requires(post): systemd-units diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index da7e9024f..1a4fff6ff 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -25,7 +25,6 @@ BuildRequires: svrcore-devel BuildRequires: zlib BuildRequires: zlib-devel -Conflicts: pki-tps-tomcat Requires: java >= 1:1.7.0 Requires: mod_nss Requires: mod_perl |