Resolves: rhbz#1951282 FTBFS
This commit is contained in:
Caolán McNamara
parent
4436d55adb
commit
232232bb51
117
librepository-1.1.3-remove-commons-logging.patch
Normal file
117
librepository-1.1.3-remove-commons-logging.patch
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java
|
||||||
|
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:16:05.369984495 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:17:30.417035353 +0100
|
||||||
|
@@ -21,8 +21,7 @@
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentCreationException;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentEntity;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentIOException;
|
||||||
|
@@ -35,7 +34,7 @@
|
||||||
|
|
||||||
|
public class ZipContentLocation implements ContentLocation
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ZipContentLocation.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ZipContentLocation.class.getName());
|
||||||
|
private ZipRepository repository;
|
||||||
|
private ZipContentLocation parent;
|
||||||
|
private String comment;
|
||||||
|
@@ -114,7 +113,7 @@
|
||||||
|
final Object entry = entries.get(path);
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ZipContentLocation location;
|
||||||
|
@@ -164,7 +163,7 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -188,12 +187,12 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Duplicate Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Duplicate Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (entry != null)
|
||||||
|
{
|
||||||
|
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
}
|
||||||
|
final ZipContentItem contentItem = new ZipContentItem(repository, this, zipEntry, data);
|
||||||
|
entries.put(path, contentItem);
|
||||||
|
@@ -352,4 +351,4 @@
|
||||||
|
{
|
||||||
|
return (entries.remove(entity.getName()) != null);
|
||||||
|
}
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
||||||
|
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java
|
||||||
|
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:16:05.365984446 +0100
|
||||||
|
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:17:22.342935587 +0100
|
||||||
|
@@ -21,8 +21,7 @@
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
|
||||||
|
-import org.apache.commons.logging.Log;
|
||||||
|
-import org.apache.commons.logging.LogFactory;
|
||||||
|
+import java.util.logging.Logger;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentCreationException;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentEntity;
|
||||||
|
import org.pentaho.reporting.libraries.repository.ContentIOException;
|
||||||
|
@@ -39,7 +38,7 @@
|
||||||
|
*/
|
||||||
|
public class ZipReadContentLocation implements ContentLocation
|
||||||
|
{
|
||||||
|
- private static final Log logger = LogFactory.getLog(ZipReadContentLocation.class);
|
||||||
|
+ private static final Logger logger = Logger.getLogger(ZipReadContentLocation.class.getName());
|
||||||
|
private ZipReadRepository repository;
|
||||||
|
private ZipReadContentLocation parent;
|
||||||
|
private String comment;
|
||||||
|
@@ -117,7 +116,7 @@
|
||||||
|
final Object entry = entries.get(path);
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ZipReadContentLocation location;
|
||||||
|
@@ -164,7 +163,7 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -188,12 +187,12 @@
|
||||||
|
{
|
||||||
|
if (entry instanceof ContentItem)
|
||||||
|
{
|
||||||
|
- logger.warn("Duplicate Content-Entry encountered: " + path);
|
||||||
|
+ logger.warning("Duplicate Content-Entry encountered: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (entry != null)
|
||||||
|
{
|
||||||
|
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
|
||||||
|
}
|
||||||
|
final ZipReadContentItem contentItem = new ZipReadContentItem(repository, this, zipEntry, data);
|
||||||
|
entries.put(path, contentItem);
|
||||||
@ -14,6 +14,7 @@ BuildArch: noarch
|
|||||||
Patch0: librepository-1.1.2.build.patch
|
Patch0: librepository-1.1.2.build.patch
|
||||||
Patch1: librepository-1.1.2.java11.patch
|
Patch1: librepository-1.1.2.java11.patch
|
||||||
Patch2: librepository-1.1.3-remove-ant-contrib-support.patch
|
Patch2: librepository-1.1.3-remove-ant-contrib-support.patch
|
||||||
|
Patch3: librepository-1.1.3-remove-commons-logging.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
LibRepository provides a simple abstraction layer to access bulk content that
|
LibRepository provides a simple abstraction layer to access bulk content that
|
||||||
@ -32,10 +33,11 @@ Javadoc for %{name}.
|
|||||||
%patch0 -p1 -b .build
|
%patch0 -p1 -b .build
|
||||||
%patch1 -p1 -b .java11
|
%patch1 -p1 -b .java11
|
||||||
%patch2 -p1 -b .no_antcontrib
|
%patch2 -p1 -b .no_antcontrib
|
||||||
|
%patch3 -p1 -b .no_commons_logging
|
||||||
|
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
build-jar-repository -s -p lib commons-logging-api libbase
|
build-jar-repository -s -p lib libbase
|
||||||
|
|
||||||
%build
|
%build
|
||||||
ant jar javadoc
|
ant jar javadoc
|
||||||
@ -61,6 +63,7 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|||||||
%changelog
|
%changelog
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
- Related: rhbz#1951282 replace apache-commons-logging with java.util.logging
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-29
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-29
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user