commit 40454a82796076b5690506d1acfd74e00dd6055b
Author: Darryl L. Pierce <mcpierce(a)gmail.com>
Date: Thu May 1 14:27:12 2014 -0400
Rebased on Proton 0.7.
.gitignore | 1 +
qpid-proton-java.spec | 26 +++++++++++++++++---------
sources | 2 +-
3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd22b7e..b494b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qpid-proton-0.6.tar.gz
+/qpid-proton-0.7.tar.gz
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index 5bc54db..7c47e37 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -1,6 +1,6 @@
Name: qpid-proton-java
-Version: 0.6
-Release: 3%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: Java libraries for Qpid Proton
License: ASL 2.0
URL:
http://qpid.apache.org/proton/
@@ -20,15 +20,19 @@ BuildRequires: mvn(org.mockito:mockito-core)
BuildArch: noarch
+
%description
Java language bindings for the Qpid Proton messaging framework.
+# === qpid-proton-java-javadoc
+
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
This package contains javadoc for %{name}.
+
%prep
%setup -q -n qpid-proton-%{version}
@@ -39,33 +43,37 @@ rm -r tools docs config.sh examples/messenger/c \
examples/include CMakeLists.txt bin proton-c \
tests/smoke tests/ruby tests/python tests/tools
-#sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' proton-j/proton/pom.xml
sed -i 's|PEMReader|PEMParser|' \
-
proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+
proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
sed -i 's|pemReader = new PEMParser(reader, passwordFinder);|pemReader = new
PEMParser(reader);|' \
-
proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+
proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
-#%%pom_disable_module "tests"
%pom_remove_dep org.python:jython-standalone tests
rm -r tests/java/org/apache/qpid/proton/JythonTest.java
-%pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'proton-jni']"
tests
+
%build
%mvn_build
+
%install
%mvn_install
+
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc proton-j/proton-api/LICENSE
+%doc proton-j/LICENSE
%doc examples/messenger/java/README.txt
%files javadoc -f .mfiles-javadoc
-%doc proton-j/proton-api/LICENSE
+%doc proton-j/LICENSE
+
%changelog
+* Thu May 1 2014 Darryl L. Pierce <dpierce(a)redhat.com> - 0.7-1
+- Rebased on Proton 0.7.
+
* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 0.6-3
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index a81ddae..7dc1201 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8987587270dd8208cab072daa44cdc37 qpid-proton-0.6.tar.gz
+ec46fd02f1ac9f4b03e08aad22ab2506 qpid-proton-0.7.tar.gz