From df72555b0eede1d330de75de7214b4ca119f2bc3 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 10 Jun 2013 14:47:07 +0200
Subject: [PATCH] Fix license tag (CC-BY added)

---
 httpcomponents-core.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 5de0756..c718918 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -3,9 +3,12 @@
 Name:              httpcomponents-core
 Summary:           Set of low level Java HTTP transport components for HTTP services
 Version:           4.2.4
-Release:           3%{?dist}
+Release:           4%{?dist}
 Group:             Development/Libraries
-License:           ASL 2.0
+# The project is licensed under ASL 2.0, but it contains annotations
+# in the package org.apache.http.annotation which are derived
+# from JCIP-ANNOTATIONS project (CC-BY licensed)
+License:           ASL 2.0 and CC-BY
 URL:               http://hc.apache.org/
 Source0:           http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
 BuildArch:         noarch
@@ -96,6 +99,9 @@ done
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jun 10 2013 Michal Srb <msrb@redhat.com> - 4.2.4-4
+- Fix license tag (CC-BY added)
+
 * Fri May 17 2013 Alexander Kurtakov <akurtako@redhat.com> 4.2.4-3
 - Fix bundle plugin configuration to produce sane manifest.
 - Do not duplicate javadoc files list.