From 42f46c14f4f13843d7877d74175a3c86dba23ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= Date: Thu, 13 Oct 2022 17:00:19 +0200 Subject: [PATCH] Remove glyphicons resources from source package Resolves: rhbz#2136185 --- .gitignore | 1 + generate-tarball.sh | 29 +++++++++++++++++++++++++++++ log4j.spec | 9 +++++++-- sources | 2 +- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index c4e3cdf..bf7b4af 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /apache-log4j-2.16.0-src.tar.gz /apache-log4j-2.17.0-src.tar.gz /apache-log4j-2.17.1-src.tar.gz +/log4j-2.17.1.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..6959389 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +name=log4j +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz.asc" -O "${name}-${version}.orig.tar.gz.asc" +wget "https://www.apache.org/dist/logging/KEYS" -O "${name}-${version}.keyring" + +# VERIFY +$(rpm -E '%{gpgverify}') --keyring="${name}-${version}.keyring" --signature="${name}-${version}.orig.tar.gz.asc" --data="${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete +find -name '*.zip' -delete +find -name '*.dll' -delete +rm -rf "apache-log4j-${version}-src/src/site" + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/log4j.spec b/log4j.spec index 980a0bf..386f85a 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,13 +2,15 @@ Name: log4j Version: 2.17.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 URL: https://logging.apache.org/%{name} -Source0: https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch @@ -289,6 +291,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Tue Oct 18 2022 Marián Konček - 2.17.1-4 +- Remove glyphicons resources from source package + * Wed Feb 23 2022 Mikolaj Izdebski - 2.17.1-3 - Fix compatibility with OpenJDK 8 diff --git a/sources b/sources index e09283e..c3a23e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-log4j-2.17.1-src.tar.gz) = 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177 +SHA512 (log4j-2.17.1.tar.gz) = c45d51addedaa3941b4360c657dce9bf52d440dbb2fff6d5f49f90a72ccbfded4d859b5844054076754f645fa0f4f80e550291a5d934f2f684a288603b5f81a3