[qpid-proton/f18] Rebased on Proton 0.4.

[Darryl L. Pierce]

commit 18d6414b6c59ddd5aabf7f007831b42a1dee5d71
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Tue Feb 26 10:52:47 2013 -0500

    Rebased on Proton 0.4.

 .gitignore                                         |    1 +
 ...Fixes-building-proton-on-non-x86-platform.patch |   31 -----------------
 ...Assigns-a-default-value-to-scanned-in-cod.patch |   31 -----------------
 ...PROTON-246-Copying-nested-data-fails-in-s.patch |   36 --------------------
 qpid-proton.spec                                   |   28 +++++----------
 sources                                            |    2 +-
 6 files changed, 12 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06a2b33..f9e5562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qpid-proton-c-0.3.tar.gz
+/qpid-proton-0.4.tar.gz
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 3090891..bb6a70b 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,13 +1,13 @@
 %global proton_datadir %{_datadir}/proton-%{version}
 
 Name:           qpid-proton
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A high performance, lightweight messaging library
 
 License:        ASL 2.0
 URL:            http://qpid.apache.org/proton/
-Source0:        http://www.apache.org/dist/qpid/proton/%{version}/qpid-proton-c-%{version}.tar.gz
+Source0:        http://www.apache.org/dist/qpid/proton/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake >= 2.6
 BuildRequires:  swig
@@ -19,13 +19,6 @@ BuildRequires:  python-devel
 BuildRequires:  epydoc
 
 
-# BZ#901526
-Patch1: 01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch
-Patch2: 02-PROTON-202-Assigns-a-default-value-to-scanned-in-cod.patch
-# PROTON-230, PROTON-246
-Patch3: 03-PROTON-230-PROTON-246-Copying-nested-data-fails-in-s.patch
-
-
 %description
 Proton is a high performance, lightweight messaging library. It can be used in
 the widest range of messaging applications including brokers, client libraries,
@@ -84,11 +77,7 @@ Summary: Documentation for the Python language bindings for Qpid Proton
 
 
 %prep
-%setup -q -n qpid-proton-c-%{version}
-
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -101,14 +90,14 @@ make all docs %{?_smp_mflags}
 
 chmod +x %{buildroot}%{python_sitearch}/_cproton.so
 
-install -m 644 docs/man/proton.1 %{buildroot}%{_mandir}/man1/proton.1
-
 # clean up files that are not shipped
 rm -rf %{buildroot}%{_libdir}/php
+rm -rf %{buildroot}%{_libdir}/java
+rm -rf %{buildroot}%{_libdir}/libproton-jni.so
 rm -rf %{buildroot}%{_datarootdir}/php
+rm -rf %{buildroot}%{_datarootdir}/java
 rm -rf %{buildroot}%{_sysconfdir}/php.d
 
-
 %post -p /sbin/ldconfig
 
 
@@ -128,6 +117,9 @@ rm -rf %{buildroot}%{_sysconfdir}/php.d
 
 
 %changelog
+* Tue Feb 26 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.4-1
+- Rebased on Proton 0.4.
+
 * Thu Feb 21 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.3-4
 - Fixes copying nested data.
 - PROTON-246, PROTON-230
diff --git a/sources b/sources
index 2a86305..b090d36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-094f003b8c35a5ca7c90168b2e18a589  qpid-proton-c-0.3.tar.gz
+73d1a18017010934b2780ccc820f0773  qpid-proton-0.4.tar.gz