From 791feb3ac7bf1de556e1171c03ce7ff3d84ac63d Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 19 2018 21:57:20 +0000
Subject: [PATCH 1/2] change version in owasp-java-encoder manifest


---

diff --git a/owasp-java-encoder/0_manifest.patch b/owasp-java-encoder/0_manifest.patch
index 566c126..51e7b76 100644
--- a/owasp-java-encoder/0_manifest.patch
+++ b/owasp-java-encoder/0_manifest.patch
@@ -1,13 +1,12 @@
 diff -Nur owasp-java-encoder-1.2.1-orig/META-INF/MANIFEST.MF owasp-java-encoder-1.2.1/META-INF/MANIFEST.MF
 --- owasp-java-encoder-1.2.1-orig/META-INF/MANIFEST.MF	1969-12-31 19:00:00.000000000 -0500
 +++ owasp-java-encoder-1.2.1/META-INF/MANIFEST.MF	2018-08-07 11:59:15.923471361 -0400
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,8 @@
 +Manifest-Version: 1.0
 +Bnd-LastModified: 1533328833261
 +Bundle-ManifestVersion: 2
 +Bundle-Name: org.owasp.encoder
 +Bundle-SymbolicName: org.owasp.encoder
-+Bundle-Version: 1.2.1
 +Created-By: 1.8.0_181 (Oracle Corporation)
 +Export-Package: org.owasp.encoder
 +Tool: Bnd-1.50.0
diff --git a/owasp-java-encoder/owasp-java-encoder.spec b/owasp-java-encoder/owasp-java-encoder.spec
index bf29ece..6982b2b 100644
--- a/owasp-java-encoder/owasp-java-encoder.spec
+++ b/owasp-java-encoder/owasp-java-encoder.spec
@@ -34,6 +34,9 @@ Summary:  Javadoc for %{name}
 
 %patch0 -p1
 
+# add version number in OSGi metadata
+sed -i '/^Bundle-SymbolicName: org.owasp.encoder$/a Bundle-Version: %{version}' %{_builddir}/%{name}-%{version}/META-INF/MANIFEST.MF
+
 %pom_disable_module jsp
 %pom_disable_module esapi
 

From f048620069a1fb4a7b172bb1403f63fe20cf0f75 Mon Sep 17 00:00:00 2001
From: Salman Siddiqui <sasiddiq@redhat.com>
Date: Nov 19 2018 21:59:29 +0000
Subject: [PATCH 2/2] change directory-maven-plugin license to "ASL 2.0" (previously "ASL-2.0")


---

diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec
index ab626aa..03a7342 100644
--- a/directory-maven-plugin/directory-maven-plugin.spec
+++ b/directory-maven-plugin/directory-maven-plugin.spec
@@ -3,7 +3,7 @@ Version:    0.3.1
 Release:    1%{?dist}
 Summary:    Establish locations for files in multi-module builds
 
-License:    ASL-2.0
+License:    ASL 2.0
 URL:        https://github.com/jdcasey/directory-maven-plugin
 
 Source0:    https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz