Add jp_minimal conditional
This commit is contained in:
parent
f1f9650b9a
commit
6d3c9db2f8
78
log4j.spec
78
log4j.spec
@ -1,8 +1,8 @@
|
||||
%bcond_without nosql
|
||||
%bcond_with jp_minimal
|
||||
|
||||
Name: log4j
|
||||
Version: 2.7
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Java logging package
|
||||
BuildArch: noarch
|
||||
License: ASL 2.0
|
||||
@ -13,34 +13,33 @@ BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.beust:jcommander)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
|
||||
BuildRequires: mvn(com.lmax:disruptor)
|
||||
BuildRequires: mvn(com.sun.mail:javax.mail)
|
||||
BuildRequires: mvn(org.apache:apache:pom:)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.fusesource.jansi:jansi)
|
||||
BuildRequires: mvn(org.jctools:jctools-core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-ext)
|
||||
|
||||
%if %{without jp_minimal}
|
||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml)
|
||||
BuildRequires: mvn(com.fasterxml.woodstox:woodstox-core)
|
||||
BuildRequires: mvn(com.lmax:disruptor)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
BuildRequires: mvn(com.sun.mail:javax.mail)
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: mvn(javax.servlet.jsp:jsp-api)
|
||||
BuildRequires: mvn(javax.servlet:servlet-api)
|
||||
BuildRequires: mvn(org.apache:apache:pom:)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.commons:commons-csv)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
|
||||
BuildRequires: mvn(org.fusesource.jansi:jansi)
|
||||
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.jctools:jctools-core)
|
||||
%if %{with nosql}
|
||||
BuildRequires: mvn(org.lightcouch:lightcouch)
|
||||
BuildRequires: mvn(org.liquibase:liquibase-core)
|
||||
BuildRequires: mvn(org.mongodb:mongo-java-driver)
|
||||
%endif
|
||||
BuildRequires: mvn(org.osgi:osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-ext)
|
||||
BuildRequires: mvn(org.zeromq:jeromq)
|
||||
BuildRequires: mvn(sun.jdk:jconsole)
|
||||
%endif
|
||||
|
||||
Obsoletes: %{name}-osgi < %{version}-%{release}
|
||||
|
||||
@ -48,18 +47,19 @@ Obsoletes: %{name}-osgi < %{version}-%{release}
|
||||
Log4j is a tool to help the programmer output log statements to a
|
||||
variety of output targets.
|
||||
|
||||
%package osgi
|
||||
Summary: Apache Log4J Core OSGi Bundles
|
||||
|
||||
%description osgi
|
||||
Apache Log4J Core OSGi Bundles.
|
||||
|
||||
%package slf4j
|
||||
Summary: Binding between LOG4J 2 API and SLF4J
|
||||
|
||||
%description slf4j
|
||||
Binding between LOG4J 2 API and SLF4J.
|
||||
|
||||
%if %{without jp_minimal}
|
||||
%package osgi
|
||||
Summary: Apache Log4J Core OSGi Bundles
|
||||
|
||||
%description osgi
|
||||
Apache Log4J Core OSGi Bundles.
|
||||
|
||||
%package taglib
|
||||
Summary: Apache Log4j Tag Library
|
||||
|
||||
@ -93,7 +93,6 @@ Summary: Apache Log4j BOM
|
||||
Apache Log4j 2 Bill of Material
|
||||
|
||||
|
||||
%if %{with nosql}
|
||||
%package nosql
|
||||
Summary: Apache Log4j NoSql
|
||||
|
||||
@ -160,9 +159,33 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
|
||||
# BOM package shouldn't require Apache RAT
|
||||
%pom_remove_plugin :apache-rat-plugin %{name}-bom
|
||||
|
||||
%if %{without nosql}
|
||||
# tests are disabled
|
||||
%pom_remove_plugin :maven-failsafe-plugin
|
||||
|
||||
%if %{with jp_minimal}
|
||||
%pom_disable_module %{name}-jcl
|
||||
%pom_disable_module %{name}-taglib
|
||||
%pom_disable_module %{name}-jmx-gui
|
||||
%pom_disable_module %{name}-bom
|
||||
%pom_disable_module %{name}-nosql
|
||||
%pom_disable_module %{name}-web
|
||||
%pom_disable_module %{name}-iostreams
|
||||
%pom_disable_module %{name}-jul
|
||||
%pom_disable_module %{name}-liquibase
|
||||
|
||||
%pom_remove_dep -r :jackson-dataformat-yaml
|
||||
%pom_remove_dep -r :jackson-dataformat-xml
|
||||
%pom_remove_dep -r :woodstox-core
|
||||
%pom_remove_dep -r :javax.persistence
|
||||
%pom_remove_dep -r :jboss-jms-api_1.1_spec
|
||||
%pom_remove_dep -r :jeromq
|
||||
%pom_remove_dep -r :commons-csv
|
||||
%pom_remove_dep -r :hibernate-jpa-2.1-api
|
||||
|
||||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/{jackson,net/server,net/mom,config/yaml}
|
||||
rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/{db,mom}
|
||||
rm log4j-core/src/main/java/org/apache/logging/log4j/core/layout/*{Csv,Jackson,Xml,Yaml,Json,Gelf}*.java
|
||||
rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
|
||||
%endif
|
||||
|
||||
%mvn_alias :%{name}-1.2-api %{name}:%{name}
|
||||
@ -189,29 +212,34 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%if %{without jp_minimal}
|
||||
%jpackage_script org.apache.logging.log4j.jmx.gui.ClientGUI '' '' %{name}/%{name}-jmx-gui:%{name}/%{name}-core %{name}-jmx false
|
||||
%endif
|
||||
|
||||
%files -f .mfiles
|
||||
%dir %{_javadir}/%{name}
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
%files slf4j -f .mfiles-slf4j
|
||||
%if %{without jp_minimal}
|
||||
%files taglib -f .mfiles-taglib
|
||||
%files jcl -f .mfiles-jcl
|
||||
%files web -f .mfiles-web
|
||||
%files bom -f .mfiles-bom
|
||||
%if %{with nosql}
|
||||
%files nosql -f .mfiles-nosql
|
||||
%files liquibase -f .mfiles-liquibase
|
||||
%endif
|
||||
%files jmx-gui -f .mfiles-jmx-gui
|
||||
%{_bindir}/%{name}-jmx
|
||||
%endif
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 15 2017 Michael Simacek <msimacek@redhat.com> - 2.7-4
|
||||
- Add jp_minimal conditional
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user