From f251e900b2b307a1e0987bbb413fe9f5962f0bc8 Mon Sep 17 00:00:00 2001
From: Michael Mraka <michael.mraka@redhat.com>
Date: Thu, 3 Jul 2014 15:22:56 +0200
Subject: [PATCH 1/2] updated dependencies for RHEL7

---
 apache-commons-fileupload.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
index 0a6eb4c..2795553 100644
--- a/apache-commons-fileupload.spec
+++ b/apache-commons-fileupload.spec
@@ -26,14 +26,14 @@ BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-plugin-bundle
 BuildRequires:    maven-release-plugin
 BuildRequires:    maven-resources-plugin
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:    portlet-2.0-api
 %endif
 
 Requires:         java-headless >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         apache-commons-io
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires:         portlet-2.0-api
 %endif
 
@@ -64,7 +64,7 @@ This package contains the API documentation for %{name}.
 sed -i 's/\r//' LICENSE.txt
 sed -i 's/\r//' NOTICE.txt
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 # fix gId
 sed -i "s|<groupId>portlet-api</groupId>|<groupId>javax.portlet</groupId>|" pom.xml
 %else

From 9090530f49668269c6622ff1e03dfd75dbd0af92 Mon Sep 17 00:00:00 2001
From: Michael Mraka <michael.mraka@redhat.com>
Date: Tue, 4 Apr 2017 13:25:18 +0200
Subject: [PATCH 2/2] get back jakarta-* obsolete

fixes

Transaction check error:
  file /usr/share/java/commons-fileupload.jar conflicts between attempted installs of jakarta-commons-fileupload-1:1.2.1-1.jpp5.noarch and apache-commons-fileupload-1.3.2-3.el7.noarch
---
 apache-commons-fileupload.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
index 8d35475..daca47b 100644
--- a/apache-commons-fileupload.spec
+++ b/apache-commons-fileupload.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-fileupload
 Version:        1.3.2
-Release:        3%{?dist}
+Release:        3.1%{?dist}
 Summary:        API to work with HTML file upload
 License:        ASL 2.0
 URL:            http://commons.apache.org/fileupload/
@@ -19,6 +19,9 @@ BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(javax.portlet:portlet-api)
 %endif
 
+Provides:         jakarta-commons-fileupload = 1:%{version}-%{release}
+Obsoletes:        jakarta-commons-fileupload < 1:1.2.1-2
+
 %description
 The javax.servlet package lacks support for RFC-1867, HTML file
 upload.  This package provides a simple to use API for working with