From a1305e3875584afd14eba210bd933590452bfcdb Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Sep 18 2013 12:27:17 +0000
Subject: Fix license tag (Resolves: rhbz#979394)


- Add ASL 1.1 license text

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index ccfeeb2..9ab3c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ fop-1.0-src.tar.gz
 /event-model.tgz
 /fop-1.1-src.tar.gz
 /fop-1.1-clean.tar.gz
+/LICENSE-1.1.txt
diff --git a/fop.spec b/fop.spec
index 6c098b2..8f57679 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,14 +1,18 @@
 Name:		fop
 Summary:	XSL-driven print formatter
 Version:	1.1
-Release:	3%{?dist}
-License:	ASL 2.0
+Release:	4%{?dist}
+# ASL 1.1:
+# several files in src/java/org/apache/fop/render/awt/viewer/resources/
+# rest is ASL 2.0
+License:	ASL 2.0 and ASL 1.1
 URL:		http://xmlgraphics.apache.org/fop
 # ./clean-tarball %{version}
 Source0:	%{name}-%{version}-clean.tar.gz
 Source1:	%{name}.script
 Source2:	batik-pdf-MANIFEST.MF
 Source3:	http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom
+Source4:	http://www.apache.org/licenses/LICENSE-1.1.txt
 Patch0:		%{name}-main.patch
 Patch1:		%{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch
 
@@ -57,6 +61,8 @@ Javadoc for %{name}.
 %patch0 -p0
 %patch1 -p1
 
+cp %{SOURCE4} LICENSE-1.1
+
 sed -i -e "s|1.4|1.5|g" build.xml
 
 #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575
@@ -97,7 +103,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %files
-%doc LICENSE README NOTICE
+%doc LICENSE LICENSE-1.1 README NOTICE
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_javadir}/pdf-transcoder.jar
@@ -107,10 +113,14 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
-%doc LICENSE
+%doc LICENSE LICENSE-1.1
 
 
 %changelog
+* Wed Sep 18 2013 Michal Srb <msrb@redhat.com> - 1.1-4
+- Fix license tag (Resolves: rhbz#979394)
+- Add ASL 1.1 license text
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 5244438..1887526 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 0eaef1991f1dbc1fcfb238c918cecbf3  fop-1.1-clean.tar.gz
+92afa66b413bb09a3bbd590091a836f5  LICENSE-1.1.txt