[bouncycastle-mail] Remove unavailable dep from pom.xml

Michal Srb msrb at fedoraproject.org
Tue Feb 25 09:28:40 UTC 2014


commit d3fabbaf77ad1d9123b17cc5c062b6804d4984e0
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Feb 25 10:25:14 2014 +0100

    Remove unavailable dep from pom.xml

 bouncycastle-mail.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/bouncycastle-mail.spec b/bouncycastle-mail.spec
index e5509a7..978fa87 100644
--- a/bouncycastle-mail.spec
+++ b/bouncycastle-mail.spec
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          %{ver}
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MIT
 URL:              http://www.bouncycastle.org/
 # sh create-tarball.sh
@@ -50,6 +50,9 @@ rm -f src/org/bouncycastle/mail/smime/test/AllTests.java
 # missing test data
 sed -i 's|new ParserTest()|//&|' src/org/bouncycastle/openssl/test/AllTests.java
 
+cp %{SOURCE1} pom.xml
+# TODO: remove when #1022551 is resolved
+%pom_remove_dep :bcpkix-jdk15on
 
 %build
 pushd src
@@ -81,7 +84,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # maven pom
 install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
 %add_maven_depmap -a "org.bouncycastle:bcmail-jdk16" JPP-bcmail.pom bcmail.jar
 
 %check
@@ -104,6 +107,9 @@ popd
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 25 2014 Michal Srb <msrb at redhat.com> - 1.50-2
+- Remove unavailable dep from pom.xml
+
 * Mon Feb 24 2014 Michal Srb <msrb at redhat.com> - 1.50-1
 - Update to upstream version 1.50
 - Switch to java-headless (Resolves: rhbz#1067986)


More information about the scm-commits mailing list