From 41e10416ec3eb2e715ddd929a7433448d8722b7d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 5 Oct 2019 22:50:23 +0200 Subject: [PATCH] update to version 3.4.1 --- .gitignore | 4 ++++ jboss-logging.spec | 28 ++++++++++------------------ sources | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index f2736e7..8fa4a37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /jboss-logging-3.0.1.GA.tar.xz /jboss-logging-3.1.0.CR1.tar.xz /jboss-logging-3.1.0.GA.tar.xz @@ -5,3 +8,4 @@ /3.1.3.GA.tar.gz /3.1.4.GA.tar.gz /3.3.0.Final.tar.gz +/jboss-logging-3.4.1.Final.tar.gz diff --git a/jboss-logging.spec b/jboss-logging.spec index 6a30c2c..8b5feee 100644 --- a/jboss-logging.spec +++ b/jboss-logging.spec @@ -2,26 +2,21 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-logging -Version: 3.3.0 -Release: 7%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: The JBoss Logging Framework License: ASL 2.0 + URL: https://github.com/jboss-logging/jboss-logging -Source0: https://github.com/jboss-logging/jboss-logging/archive/%{namedversion}.tar.gz +Source0: %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz BuildArch: noarch -BuildRequires: git -BuildRequires: graphviz BuildRequires: maven-local -BuildRequires: mvn(jdepend:jdepend) -BuildRequires: mvn(log4j:log4j:12) +BuildRequires: mvn(log4j:log4j:1.2.16) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.logging.log4j:log4j-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) BuildRequires: mvn(org.jboss:jboss-parent:pom:) -BuildRequires: mvn(org.jboss.apiviz:apiviz) BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -35,13 +30,7 @@ Summary: Javadoc for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n jboss-logging-%{namedversion} - -%pom_xpath_set pom:properties/pom:version.org.apache.log4j 12 - -# SLF4j 1.7 upgrade -sed -i "s|map = MDC.getCopyOfContextMap();|map = (Map) MDC.getCopyOfContextMap();|" \ - src/main/java/org/jboss/logging/Slf4jLoggerProvider.java +%setup -q -n %{name}-%{namedversion} # Unneeded task %pom_remove_plugin :maven-source-plugin @@ -50,7 +39,7 @@ cp -p src/main/resources/META-INF/LICENSE.txt . sed -i 's/\r//' LICENSE.txt %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -62,6 +51,9 @@ sed -i 's/\r//' LICENSE.txt %license LICENSE.txt %changelog +* Sat Oct 05 2019 Fabio Valentini - 3.4.1-1 +- Update to version 3.4.1. + * Thu Jul 25 2019 Fedora Release Engineering - 3.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b5dc931..c62df9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c432e0076d1d5fd06a191d72f191943a 3.3.0.Final.tar.gz +SHA512 (jboss-logging-3.4.1.Final.tar.gz) = 830aa91dd1715e55c1938d3d01f2d6c1200dd2ece74378f38e750c4a2ef27790a232246115fe58452807bec36131f9ee12161a47bb6cbbf585017b7d7d8fab16