Disable liquibase to fix FTBFS

This commit is contained in:
Michael Simacek 2018-05-28 11:06:09 +02:00
parent 01554e076c
commit 8c0165ffbc

View File

@ -2,7 +2,7 @@
Name: log4j
Version: 2.9.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Java logging package
BuildArch: noarch
License: ASL 2.0
@ -37,14 +37,14 @@ BuildRequires: mvn(org.apache.commons:commons-csv)
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api)
BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec)
BuildRequires: mvn(org.lightcouch:lightcouch)
BuildRequires: mvn(org.liquibase:liquibase-core)
BuildRequires: mvn(org.mongodb:mongo-java-driver)
BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.zeromq:jeromq)
BuildRequires: mvn(sun.jdk:jconsole)
%endif
Obsoletes: %{name}-osgi < %{version}-%{release}
Obsoletes: %{name}-osgi < 2.9.1-4
Obsoletes: %{name}-liquibase < 2.9.1-4
%description
Log4j is a tool to help the programmer output log statements to a
@ -102,12 +102,6 @@ Summary: Apache Log4j NoSql
%description nosql
Use NoSQL databases such as MongoDB and CouchDB to append log messages.
%package liquibase
Summary: Apache Log4j Liquibase Binding
%description liquibase
The Apache Log4j Liquibase binding to Log4j 2 Core.
%endif
%package javadoc
@ -151,6 +145,9 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockin
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
%pom_remove_dep -r :kafka-clients
# not compatible with fedora's version
%pom_disable_module %{name}-liquibase
# System scoped dep provided by JDK
%pom_remove_dep :jconsole %{name}-jmx-gui
%pom_add_dep sun.jdk:jconsole %{name}-jmx-gui
@ -177,7 +174,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
%pom_disable_module %{name}-web
%pom_disable_module %{name}-iostreams
%pom_disable_module %{name}-jul
%pom_disable_module %{name}-liquibase
%pom_disable_module %{name}-core-its
%pom_remove_dep -r :jackson-dataformat-yaml
@ -210,7 +206,6 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
%mvn_package ':%{name}-web' web
%mvn_package ':%{name}-bom' bom
%mvn_package ':%{name}-nosql' nosql
%mvn_package ':%{name}-liquibase' liquibase
%mvn_package :log4j-core-its __noinstall
@ -236,7 +231,6 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
%files web -f .mfiles-web
%files bom -f .mfiles-bom
%files nosql -f .mfiles-nosql
%files liquibase -f .mfiles-liquibase
%files jmx-gui -f .mfiles-jmx-gui
%{_bindir}/%{name}-jmx
%endif
@ -246,6 +240,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
%changelog
* Mon May 28 2018 Michael Simacek <msimacek@redhat.com> - 2.9.1-4
- Disable liquibase to fix FTBFS
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild