From 764e8e18a4108f8feb9fad6322f4d1f9da408a10 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 30 Apr 2013 17:04:24 +0200 Subject: [PATCH 01/66] fix broken changelog --- clojure.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clojure.spec b/clojure.spec index e118882..6a680e2 100644 --- a/clojure.spec +++ b/clojure.spec @@ -84,6 +84,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Tue Apr 30 2013 Jochen Schmitt - 1:1.5.1-1 +- New upstream release. + * Sat Mar 2 2013 Jochen Schmitt - 1:1.5.0-1 - New upstream release From 51bd2aa9f1dc9c7b7c4952cadf16b3f13f40709c Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 30 Apr 2013 17:04:24 +0200 Subject: [PATCH 02/66] fix broken changelog --- clojure.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clojure.spec b/clojure.spec index e118882..6a680e2 100644 --- a/clojure.spec +++ b/clojure.spec @@ -84,6 +84,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Tue Apr 30 2013 Jochen Schmitt - 1:1.5.1-1 +- New upstream release. + * Sat Mar 2 2013 Jochen Schmitt - 1:1.5.0-1 - New upstream release From 13bd86d312bfc4e9070af67096742267322e4ca5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:09:54 -0500 Subject: [PATCH 03/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 6a680e2..68d0844 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -84,6 +84,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1:1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Apr 30 2013 Jochen Schmitt - 1:1.5.1-1 - New upstream release. From f7bc79ecd2456c788752d311fd85b5eb3d18cde2 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 5 Mar 2014 23:54:55 +0100 Subject: [PATCH 04/66] New upstream pre-release - Add support for headless java (#1068005) --- .gitignore | 1 + clojure.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f871958..9c7c810 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /clojure-clojure-1.5.0-RC1.zip /clojure-1.5.0.zip /clojure-1.5.1.zip +/clojure-1.6.0-beta2.zip diff --git a/clojure.spec b/clojure.spec index 68d0844..d47c030 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,17 +2,18 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} +%global full_version %{version}-beta2 Name: clojure Epoch: 1 -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.6.0 +Release: 0.2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip Source1: clojure.sh @@ -25,7 +26,12 @@ BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 Requires: jpackage-utils +%if 0%{?fedora} > 20 +Requires: java-headless >= 1:1.6 +%else Requires: java >= 1:1.6 +%endif + Requires: objectweb-asm %description @@ -41,7 +47,7 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-%{version} +%setup -q -n %{archivename}-%{full_version} %build ant -Dmaven.test.skip=1 @@ -84,6 +90,10 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Mar 5 2014 Jochen Schmitt - 1:1.6.0-0.2 +- New upstream pre-release +- Add support for headless java (#1068005) + * Sat Aug 03 2013 Fedora Release Engineering - 1:1.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a0c9c95..30d5cc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f46d49e5d26f776e2971473d70cf416f clojure-1.5.1.zip +199480ea8449e545f058523f798897d0 clojure-1.6.0-beta2.zip From c6fe2afca0223601aef8bdca81c30e7af984677f Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 18 Mar 2014 19:57:14 +0100 Subject: [PATCH 05/66] =?UTF-8?q?Rel=C3=B6ease=20candidate=20of=20clojure?= =?UTF-8?q?=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clojure.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clojure.spec b/clojure.spec index d47c030..a439bdc 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta2 +%global full_version %{version}-RC1 Name: clojure Epoch: 1 Version: 1.6.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Tue Mar 18 2014 Jochen Schmitt - 1:1.6.0-0.3 +- Relöease candidate of clojure 1.6.0 + * Wed Mar 5 2014 Jochen Schmitt - 1:1.6.0-0.2 - New upstream pre-release - Add support for headless java (#1068005) From 356c29d5126843f12d29236971bf349f054e1eff Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 21 Mar 2014 16:44:44 +0100 Subject: [PATCH 06/66] Upload forgotten source file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c7c810..a6e0868 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /clojure-1.5.0.zip /clojure-1.5.1.zip /clojure-1.6.0-beta2.zip +/clojure-1.6.0-RC1.zip diff --git a/sources b/sources index 30d5cc7..5047e93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -199480ea8449e545f058523f798897d0 clojure-1.6.0-beta2.zip +1bcfff0e26e9acea06eea562e7311893 clojure-1.6.0-RC1.zip From cc667ce14e17486d3b69178a60f9fc08a3474eca Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mon, 24 Mar 2014 15:55:40 +0100 Subject: [PATCH 07/66] New release candidate of clujure 1.6.0 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a6e0868..945d3de 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /clojure-1.5.1.zip /clojure-1.6.0-beta2.zip /clojure-1.6.0-RC1.zip +/clojure-1.6.0-RC3.zip diff --git a/clojure.spec b/clojure.spec index a439bdc..f330659 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-RC1 +%global full_version %{version}-RC3 Name: clojure Epoch: 1 Version: 1.6.0 -Release: 0.3%{?dist} +Release: 0.5%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Mon Mar 24 2014 Jochen Schmitt - 1:1.6.0-0.5 +- New release candidate of clujure 1.6.0 + * Tue Mar 18 2014 Jochen Schmitt - 1:1.6.0-0.3 - Relöease candidate of clojure 1.6.0 diff --git a/sources b/sources index 5047e93..1b9428c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bcfff0e26e9acea06eea562e7311893 clojure-1.6.0-RC1.zip +5b78c688f22b6f88835c372cad582424 clojure-1.6.0-RC3.zip From aa827baaf7a145ae0a76afeeaf2086e58e7f5e1e Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 25 Mar 2014 17:00:17 +0100 Subject: [PATCH 08/66] New upstream release --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 945d3de..f1c9ffb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /clojure-1.6.0-beta2.zip /clojure-1.6.0-RC1.zip /clojure-1.6.0-RC3.zip +/clojure-1.6.0.zip diff --git a/clojure.spec b/clojure.spec index f330659..cd00ba3 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-RC3 +%global full_version %{version} Name: clojure Epoch: 1 Version: 1.6.0 -Release: 0.5%{?dist} +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Tue Mar 25 2014 Jochen Schmitt - 1:1.6.0-1 +- New upstream release + * Mon Mar 24 2014 Jochen Schmitt - 1:1.6.0-0.5 - New release candidate of clujure 1.6.0 diff --git a/sources b/sources index 1b9428c..b1b02b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b78c688f22b6f88835c372cad582424 clojure-1.6.0-RC3.zip +1850ac22ad2b562e67688652f69b4a76 clojure-1.6.0.zip From ba47ad279503c72c62c8c719e9be65fe03c90f6c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:01:35 -0500 Subject: [PATCH 09/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index cd00ba3..a13f7bb 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1:1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Mar 25 2014 Jochen Schmitt - 1:1.6.0-1 - New upstream release From bfdcf9ee0be71c75d1a01900fbdfb5ac395a40b1 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 24 Jul 2014 18:24:51 +0200 Subject: [PATCH 10/66] Migrating to the new JAVA packaging guidelines --- clojure.spec | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/clojure.spec b/clojure.spec index a13f7bb..b01740c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -19,13 +19,11 @@ Source1: clojure.sh BuildArch: noarch -BuildRequires: maven-local +BuildRequires: javapackages-tools BuildRequires: ant >= 1.6 -BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 -Requires: jpackage-utils %if 0%{?fedora} > 20 Requires: java-headless >= 1:1.6 %else @@ -52,6 +50,8 @@ can avoid reflection. %build ant -Dmaven.test.skip=1 +%mvn_artifact pom.xml %{name}.jar + %install # jar - link to prefix'd jar so that java stuff knows where to look install -d -m 755 %{buildroot}%{_javadir} @@ -63,33 +63,18 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -d -m 755 %{buildroot}%{_bindir} install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} -%if 0%{?add_maven_depmap:1} -%add_maven_depmap JPP-%{name}.pom %{name}.jar -%else -# some systems like RHEL do not have add_maven_depmap defined -# - probably don't need JPP/%{name} -- do we? -%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP %{name} -%endif +%mvn_install -%clean -rm -rf %{buildroot} - -%if 0%{?rhel} -%post -%update_maven_depmap - -%postun -%update_maven_depmap -%endif - -%files +%files -f .mfiles %doc epl-v10.html changes.md readme.txt %{_mavenpomdir}/* -%{_mavendepmapfragdir}/* %{_javadir}/%{name}.jar %{_bindir}/%{name} %changelog +* Thu Jul 24 2014 Jochen Schmitt - 1:1.6.0-3 +- Migrating to the new JAVA packaging guidelines + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a494cbc817e8373b30fa25c0090cc8eeecad7831 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 25 Jul 2014 22:27:03 +0200 Subject: [PATCH 11/66] Add BR maven-local --- clojure.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/clojure.spec b/clojure.spec index b01740c..dc61915 100644 --- a/clojure.spec +++ b/clojure.spec @@ -20,6 +20,7 @@ Source1: clojure.sh BuildArch: noarch BuildRequires: javapackages-tools +BuildRequires: maven-local BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 From 840403343a097502c0778599c7c96d42c91b210d Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 14 Apr 2015 18:26:19 +0200 Subject: [PATCH 12/66] New upstream release --- .gitignore | 1 + clojure.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f1c9ffb..c6b593a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /clojure-1.6.0-RC1.zip /clojure-1.6.0-RC3.zip /clojure-1.6.0.zip +/clojure-1.7.0-beta1.zip diff --git a/clojure.spec b/clojure.spec index dc61915..2212844 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version} +%global full_version %{version}-beta1 Name: clojure Epoch: 1 -Version: 1.6.0 -Release: 3%{?dist} +Version: 1.7.0 +Release: 0.1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Tue Apr 14 2015 Jochen Schmitt - 1:1.7.0-0.1 +- New upstream release + * Thu Jul 24 2014 Jochen Schmitt - 1:1.6.0-3 - Migrating to the new JAVA packaging guidelines diff --git a/sources b/sources index b1b02b9..07898c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1850ac22ad2b562e67688652f69b4a76 clojure-1.6.0.zip +70d0e1199d365c56fa9f1d5cb53511c3 clojure-1.7.0-beta1.zip From de662b33c7c5d5aceb02e9970364a4087a816ef9 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 1 May 2015 23:05:20 +0200 Subject: [PATCH 13/66] New upstream release --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c6b593a..2091781 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /clojure-1.6.0-RC3.zip /clojure-1.6.0.zip /clojure-1.7.0-beta1.zip +/clojure-1.7.0-beta2.zip diff --git a/clojure.spec b/clojure.spec index 2212844..e576d4b 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta1 +%global full_version %{version}-beta2 Name: clojure Epoch: 1 Version: 1.7.0 -Release: 0.1%{?dist} +Release: 021%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Fri May 1 2015 Jochen Schmitt - 1:1.7.0-021 +- New upstream release + * Tue Apr 14 2015 Jochen Schmitt - 1:1.7.0-0.1 - New upstream release diff --git a/sources b/sources index 07898c7..c987179 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70d0e1199d365c56fa9f1d5cb53511c3 clojure-1.7.0-beta1.zip +2306329898f1843cd1edf463534e53ef clojure-1.7.0-beta2.zip From f645392ea5ee054025adf0e92dc730e8963df5de Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sat, 2 May 2015 00:30:13 +0200 Subject: [PATCH 14/66] Fix broken relelase number --- clojure.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clojure.spec b/clojure.spec index e576d4b..1150fe1 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.7.0 -Release: 021%{?dist} +Release: 0.2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,7 +73,7 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog -* Fri May 1 2015 Jochen Schmitt - 1:1.7.0-021 +* Fri May 1 2015 Jochen Schmitt - 1:1.7.0-0.2 - New upstream release * Tue Apr 14 2015 Jochen Schmitt - 1:1.7.0-0.1 From 13da06dbe6f143d4915bea8c0bb9eae6fcb2325a Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 5 Jun 2015 11:03:36 +0200 Subject: [PATCH 15/66] New upstream release --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2091781..48373ba 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /clojure-1.6.0.zip /clojure-1.7.0-beta1.zip /clojure-1.7.0-beta2.zip +/clojure-1.7.0-RC1.zip diff --git a/clojure.spec b/clojure.spec index 1150fe1..1fa24b8 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta2 +%global full_version %{version}-RC1 Name: clojure Epoch: 1 Version: 1.7.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Fri Jun 5 2015 Jochen Schmitt - 1:1.7.0-0.3 +- New upstream release + * Fri May 1 2015 Jochen Schmitt - 1:1.7.0-0.2 - New upstream release diff --git a/sources b/sources index c987179..4d68177 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2306329898f1843cd1edf463534e53ef clojure-1.7.0-beta2.zip +99f477898e1ce36625c5b7a7f7047f25 clojure-1.7.0-RC1.zip From bdc0a14999545f2e713c4f5b187d40f619f31a75 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:47:38 +0000 Subject: [PATCH 16/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 1fa24b8..8632393 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.7.0 -Release: 0.3%{?dist} +Release: 0.4%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1:1.7.0-0.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 5 2015 Jochen Schmitt - 1:1.7.0-0.3 - New upstream release From 56b9ed76d937dd4608dbd9e3bc2dcd3494760ba7 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 17 Jun 2015 20:52:56 +0200 Subject: [PATCH 17/66] New upstream release (clojure-1.7.0-RC2) --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 48373ba..0dfcbf8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /clojure-1.7.0-beta1.zip /clojure-1.7.0-beta2.zip /clojure-1.7.0-RC1.zip +/clojure-1.7.0-RC2.zip diff --git a/clojure.spec b/clojure.spec index 8632393..12a628f 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-RC1 +%global full_version %{version}-RC2 Name: clojure Epoch: 1 Version: 1.7.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Jun 17 2015 Jochen Schmitt - 1:1.7.0-0.5 +- New upstream release (clojure-1.7.0-RC2) + * Wed Jun 17 2015 Fedora Release Engineering - 1:1.7.0-0.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4d68177..e0235ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99f477898e1ce36625c5b7a7f7047f25 clojure-1.7.0-RC1.zip +5be3bf7e7cad8bd1853d06da07a3a0f4 clojure-1.7.0-RC2.zip From 4dad94e6e13dc2ad71cc27509b01c27302e82cef Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 6 Aug 2015 05:58:46 +0200 Subject: [PATCH 18/66] New upstream release (clojure-1.7.0-RC2) --- .gitignore | 1 + clojure.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0dfcbf8..8eb76a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /clojure-1.7.0-beta2.zip /clojure-1.7.0-RC1.zip /clojure-1.7.0-RC2.zip +/clojure-1.7.0.zip diff --git a/clojure.spec b/clojure.spec index 12a628f..a5865e0 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-RC2 +%global full_version %{version} Name: clojure Epoch: 1 Version: 1.7.0 -Release: 0.5%{?dist} +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages diff --git a/sources b/sources index e0235ed..9e32af5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5be3bf7e7cad8bd1853d06da07a3a0f4 clojure-1.7.0-RC2.zip +7757a69393ec0dc52dccd53d997a6546 clojure-1.7.0.zip From 58a5bc3cc87b08d3e10fdf89c41c679b6cbeeb80 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 15 Oct 2015 19:30:57 +0200 Subject: [PATCH 19/66] New prerelease of Clojure 1.8.0 --- clojure.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clojure.spec b/clojure.spec index a5865e0..ec7f59b 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version} +%global full_version %{version}-beta1 Name: clojure Epoch: 1 -Version: 1.7.0 -Release: 1%{?dist} +Version: 1.8.0 +Release: 0.beta1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Thu Oct 15 2015 Jochen Schmitt - 1:1.8.0-0.beta1 +- New prerelease of Clojure 1.8.0 + * Wed Jun 17 2015 Jochen Schmitt - 1:1.7.0-0.5 - New upstream release (clojure-1.7.0-RC2) From 1be78f67e9b2d18e81d5a05386933243df8ff8c9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:46:16 +0000 Subject: [PATCH 20/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index ec7f59b..345e38d 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist} +Release: 0.beta1%{?dist}.1 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1:1.8.0-0.beta1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 15 2015 Jochen Schmitt - 1:1.8.0-0.beta1 - New prerelease of Clojure 1.8.0 From 69a67890b6b7cd448fedab8abea647a19849351b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:35:49 +0000 Subject: [PATCH 21/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 345e38d..1a3398c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.1 +Release: 0.beta1%{?dist}.2 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:1.8.0-0.beta1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1:1.8.0-0.beta1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e683c6a5b71ba6e90190d8b8578cabf7861ceff9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:59:26 +0000 Subject: [PATCH 22/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 1a3398c..4c12515 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.2 +Release: 0.beta1%{?dist}.3 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:1.8.0-0.beta1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1:1.8.0-0.beta1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3c21f0c1e8c98cd55421b1fcbee0393804d50d85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:08:25 +0000 Subject: [PATCH 23/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 4c12515..c30044d 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.3 +Release: 0.beta1%{?dist}.4 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:1.8.0-0.beta1.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:1.8.0-0.beta1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a391490ca9064c4ad4ae7a4f53a3a64073fe68dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:53:48 +0000 Subject: [PATCH 24/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index c30044d..e4665db 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.4 +Release: 0.beta1%{?dist}.5 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -73,6 +73,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1:1.8.0-0.beta1.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.8.0-0.beta1.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5d99a607816a97fb1978e296f03bab513faf4f2f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:40 +0100 Subject: [PATCH 25/66] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- clojure.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index e4665db..fa2b2de 100644 --- a/clojure.spec +++ b/clojure.spec @@ -10,7 +10,6 @@ Version: 1.8.0 Release: 0.beta1%{?dist}.5 Summary: A dynamic programming language that targets the Java Virtual Machine -Group: Development/Languages License: EPL URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip From 38e366ffa170b05d245bba938e13588bd21dab14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:46:01 +0000 Subject: [PATCH 26/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index fa2b2de..5915a27 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.5 +Release: 0.beta1%{?dist}.6 Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL @@ -72,6 +72,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:1.8.0-0.beta1.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1:1.8.0-0.beta1.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a5e0b0116afcd03a811e1319dde75f694c684508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 13 Feb 2019 20:06:02 +0100 Subject: [PATCH 27/66] Upload source tarball --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8eb76a1..f413088 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /clojure-1.7.0-RC1.zip /clojure-1.7.0-RC2.zip /clojure-1.7.0.zip +/clojure-1.8.0-beta1.zip diff --git a/sources b/sources index 9e32af5..4282f4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7757a69393ec0dc52dccd53d997a6546 clojure-1.7.0.zip +SHA512 (clojure-1.8.0-beta1.zip) = 2997e1899df65e091966ab6e1fea889e3725e7ebbb1ef4bb2f63d355988dfc2a763a12b64098f7ae71e4dcfaadc6abf3a2ee264d3c94348c986e7b70ac1f8c30 From d866c012c7b6ad20a7028937192cea045e7d8153 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 20:26:20 +0000 Subject: [PATCH 28/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 5915a27..d37990c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.6 +Release: 0.beta1%{?dist}.7 Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL @@ -72,6 +72,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.0-0.beta1.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1:1.8.0-0.beta1.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6aae4b2658de97da73bb47b54f0db9c061243bcd Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Wed, 4 Sep 2019 20:44:00 +0300 Subject: [PATCH 29/66] Update to upstream release 1.8.0 Add sonatype-oss-parent as a build requirement Add license macro and fix license short name --- .gitignore | 1 + clojure.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f413088..fba5c80 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /clojure-1.7.0-RC2.zip /clojure-1.7.0.zip /clojure-1.8.0-beta1.zip +/clojure-1.8.0.zip diff --git a/clojure.spec b/clojure.spec index d37990c..494c643 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,15 +2,15 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta1 +%global full_version %{version} Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.7 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine -License: EPL +License: EPL-1.0 URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip @@ -23,6 +23,7 @@ BuildRequires: maven-local BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: sonatype-oss-parent %if 0%{?fedora} > 20 Requires: java-headless >= 1:1.6 @@ -66,12 +67,18 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %mvn_install %files -f .mfiles -%doc epl-v10.html changes.md readme.txt +%license epl-v10.html +%doc changes.md readme.txt %{_mavenpomdir}/* %{_javadir}/%{name}.jar %{_bindir}/%{name} %changelog +* Wed Sep 04 2019 Markku Korkeala - 1:1.8.0-1 +- Update to upstream release 1.8.0 +- Add sonatype-oss-parent as a build requirement +- Add license macro and fix license short name + * Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.0-0.beta1.7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 4282f4e..f59d194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.8.0-beta1.zip) = 2997e1899df65e091966ab6e1fea889e3725e7ebbb1ef4bb2f63d355988dfc2a763a12b64098f7ae71e4dcfaadc6abf3a2ee264d3c94348c986e7b70ac1f8c30 +SHA512 (clojure-1.8.0.zip) = 36d95213f35ba182d8f3efb4753a50078a0f19a4ef9084c10c300ea075d11ba7d92dec51347afc5c23424800b9c75f9fcc363b23ead4f836ed193d8913ade0e4 From d5682ff6f331cf212ede5a11bcdca7dbcab0f70d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:14:17 +0000 Subject: [PATCH 30/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 494c643..d7696ec 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -74,6 +74,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1:1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Sep 04 2019 Markku Korkeala - 1:1.8.0-1 - Update to upstream release 1.8.0 - Add sonatype-oss-parent as a build requirement From a825644ccee84c0b1951efb632416233669e04f8 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Thu, 2 Apr 2020 21:44:39 +0300 Subject: [PATCH 31/66] New upstream release. Replace add_maven_depmap macros with mvn_artifact and mvn_install --- .gitignore | 1 + clojure.spec | 30 +++++++++++------------------- sources | 2 +- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index f871958..e1f132a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /clojure-clojure-1.5.0-RC1.zip /clojure-1.5.0.zip /clojure-1.5.1.zip +/clojure-1.8.0.zip diff --git a/clojure.spec b/clojure.spec index 6a680e2..96d234c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,12 +5,12 @@ Name: clojure Epoch: 1 -Version: 1.5.1 +Version: 1.8.0 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages -License: EPL +License: EPL-1.0 URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip @@ -23,6 +23,7 @@ BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: sonatype-oss-parent Requires: jpackage-utils Requires: java >= 1:1.6 @@ -46,6 +47,8 @@ can avoid reflection. %build ant -Dmaven.test.skip=1 +%mvn_artifact pom.xml %{name}.jar + %install # jar - link to prefix'd jar so that java stuff knows where to look install -d -m 755 %{buildroot}%{_javadir} @@ -57,33 +60,22 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -d -m 755 %{buildroot}%{_bindir} install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} -%if 0%{?add_maven_depmap:1} -%add_maven_depmap JPP-%{name}.pom %{name}.jar -%else -# some systems like RHEL do not have add_maven_depmap defined -# - probably don't need JPP/%{name} -- do we? -%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP %{name} -%endif +%mvn_install %clean rm -rf %{buildroot} -%if 0%{?rhel} -%post -%update_maven_depmap - -%postun -%update_maven_depmap -%endif - -%files +%files -f .mfiles %doc epl-v10.html changes.md readme.txt %{_mavenpomdir}/* -%{_mavendepmapfragdir}/* %{_javadir}/%{name}.jar %{_bindir}/%{name} %changelog +* Thu Apr 2 2020 Markku Korkeala - 1:1.8.0-1 +- New upstream release. +- Replace add_maven_depmap macros with mvn_artifact and mvn_install + * Tue Apr 30 2013 Jochen Schmitt - 1:1.5.1-1 - New upstream release. diff --git a/sources b/sources index a0c9c95..f59d194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f46d49e5d26f776e2971473d70cf416f clojure-1.5.1.zip +SHA512 (clojure-1.8.0.zip) = 36d95213f35ba182d8f3efb4753a50078a0f19a4ef9084c10c300ea075d11ba7d92dec51347afc5c23424800b9c75f9fcc363b23ead4f836ed193d8913ade0e4 From 65992a0c28094964d659eefa6ffee09010402939 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sat, 4 Apr 2020 19:51:42 +0300 Subject: [PATCH 32/66] Update to upstream release 1.9.0-alpha15 Update to require JDK 1.8 --- .gitignore | 1 + clojure.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fba5c80..aa398be 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /clojure-1.7.0.zip /clojure-1.8.0-beta1.zip /clojure-1.8.0.zip +/clojure-1.9.0-alpha15.zip diff --git a/clojure.spec b/clojure.spec index d7696ec..a24c157 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version} +%global full_version %{version}-alpha15 Name: clojure Epoch: 1 -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.9.0 +Release: 0.alpha15.1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -22,14 +22,10 @@ BuildRequires: javapackages-tools BuildRequires: maven-local BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-devel >= 1:1.8.0 BuildRequires: sonatype-oss-parent -%if 0%{?fedora} > 20 -Requires: java-headless >= 1:1.6 -%else -Requires: java >= 1:1.6 -%endif +Requires: java-headless >= 1:1.8 Requires: objectweb-asm @@ -74,6 +70,10 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Sat Apr 04 2020 Markku Korkeala - 1:1.9.0-0.alpha15.1 +- Update to upstream release 1.9.0-alpha15 +- Update to require JDK 1.8 + * Tue Jan 28 2020 Fedora Release Engineering - 1:1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f59d194..9f7cd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.8.0.zip) = 36d95213f35ba182d8f3efb4753a50078a0f19a4ef9084c10c300ea075d11ba7d92dec51347afc5c23424800b9c75f9fcc363b23ead4f836ed193d8913ade0e4 +SHA512 (clojure-1.9.0-alpha15.zip) = 88d0e0bc4dd85faa6b4d281927e659e0166cc9a9ecc2fb6e363c2f3e291f8506837d5b06143df6d7e0447128d9e7bd6004334775fad8597009cd39f37f3f77b7 From bfb75a1ebaa7764ac8470f594e097c06d1a7a27b Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Mon, 13 Apr 2020 20:43:03 +0300 Subject: [PATCH 33/66] Update to upstream release 1.9.0-beta3 Switch to use maven building Remove plugin org.sonatype.plugins:nexus-staging-maven-plugin Remove jsr166 dependency from pom --- .gitignore | 1 + clojure.sh | 6 +++++- clojure.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index aa398be..ba1be0c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /clojure-1.8.0-beta1.zip /clojure-1.8.0.zip /clojure-1.9.0-alpha15.zip +/clojure-1.9.0-beta3.zip diff --git a/clojure.sh b/clojure.sh index 4ef2bc6..74a7106 100644 --- a/clojure.sh +++ b/clojure.sh @@ -1,2 +1,6 @@ #!/bin/bash -exec java ${JAVA_OPTS} -jar /usr/share/java/clojure.jar "$@" +CLOJUREJAR=/usr/share/java/clojure/clojure.jar +CORESPECSJAR=/usr/share/java/clojure-core-specs-alpha/core.specs.alpha.jar +SPECALPHAJAR=/usr/share/java/clojure-spec-alpha/spec.alpha.jar +CLASSPATH=$CLASSPATH:$CLOJUREJAR:$SPECALPHAJAR:$CORESPECSALPHA +exec java ${JAVA_OPTS} -cp $CLASSPATH clojure.main "$@" diff --git a/clojure.spec b/clojure.spec index a24c157..fc2efa0 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-alpha15 +%global full_version %{version}-beta3 Name: clojure Epoch: 1 Version: 1.9.0 -Release: 0.alpha15.1%{?dist} +Release: 0.beta3.1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -24,10 +24,22 @@ BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.8.0 BuildRequires: sonatype-oss-parent +BuildRequires: clojure-spec-alpha >= 1:0.1.134-2 +BuildRequires: clojure-core-specs-alpha >= 1:0.1.24-2 +BuildRequires: clojure-maven-plugin >= 1.8.1 +BuildRequires: maven-compiler-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-release-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-source-plugin +BuildRequires: maven-plugin-build-helper +BuildRequires: maven-antrun-plugin Requires: java-headless >= 1:1.8 - Requires: objectweb-asm +Requires: clojure-spec-alpha >= 1:0.1.134-2 +Requires: clojure-core-specs-alpha >= 1:0.1.24-2 %description Clojure is a dynamic programming language that targets the Java @@ -43,19 +55,13 @@ can avoid reflection. %prep %setup -q -n %{archivename}-%{full_version} +%pom_remove_dep org.codehaus.jsr166-mirror:jsr166y +%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin %build -ant -Dmaven.test.skip=1 - -%mvn_artifact pom.xml %{name}.jar +%mvn_build -f -j %install -# jar - link to prefix'd jar so that java stuff knows where to look -install -d -m 755 %{buildroot}%{_javadir} -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - # startup script install -d -m 755 %{buildroot}%{_bindir} install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} @@ -65,11 +71,15 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %files -f .mfiles %license epl-v10.html %doc changes.md readme.txt -%{_mavenpomdir}/* -%{_javadir}/%{name}.jar %{_bindir}/%{name} %changelog +* Sat Apr 11 2020 Markku Korkeala - 1:1.9.0-0.beta3.1 +- Update to upstream release 1.9.0-beta3 +- Switch to use maven building +- Remove plugin org.sonatype.plugins:nexus-staging-maven-plugin +- Remove jsr166 dependency from pom + * Sat Apr 04 2020 Markku Korkeala - 1:1.9.0-0.alpha15.1 - Update to upstream release 1.9.0-alpha15 - Update to require JDK 1.8 diff --git a/sources b/sources index 9f7cd28..5ca6127 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.9.0-alpha15.zip) = 88d0e0bc4dd85faa6b4d281927e659e0166cc9a9ecc2fb6e363c2f3e291f8506837d5b06143df6d7e0447128d9e7bd6004334775fad8597009cd39f37f3f77b7 +SHA512 (clojure-1.9.0-beta3.zip) = b118c3090d1dc195b32b42ae0f657b269850c2e5125de75e5da79f1587d3b6199ed3dbd9720df1506c67ef26c2a4758ded4792e3939a03346206a8a1078f077b From 93fff0a0da4c52c34e79ab7e32c7b9f38a46323a Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Tue, 14 Apr 2020 18:19:35 +0300 Subject: [PATCH 34/66] Update to upstream release 1.9.0, update clojure-spec-alpha dependency --- .gitignore | 1 + clojure.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ba1be0c..5984b02 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /clojure-1.8.0.zip /clojure-1.9.0-alpha15.zip /clojure-1.9.0-beta3.zip +/clojure-1.9.0.zip diff --git a/clojure.spec b/clojure.spec index fc2efa0..156ab86 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta3 +%global full_version %{version} Name: clojure Epoch: 1 Version: 1.9.0 -Release: 0.beta3.1%{?dist} +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -24,7 +24,7 @@ BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.8.0 BuildRequires: sonatype-oss-parent -BuildRequires: clojure-spec-alpha >= 1:0.1.134-2 +BuildRequires: clojure-spec-alpha >= 1:0.1.143 BuildRequires: clojure-core-specs-alpha >= 1:0.1.24-2 BuildRequires: clojure-maven-plugin >= 1.8.1 BuildRequires: maven-compiler-plugin @@ -38,7 +38,7 @@ BuildRequires: maven-antrun-plugin Requires: java-headless >= 1:1.8 Requires: objectweb-asm -Requires: clojure-spec-alpha >= 1:0.1.134-2 +Requires: clojure-spec-alpha >= 1:0.1.143 Requires: clojure-core-specs-alpha >= 1:0.1.24-2 %description @@ -74,6 +74,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Tue Apr 14 2020 Markku Korkeala - 1:1.9.0-1 +- Update to upstream release 1.9.0, update clojure-spec-alpha dependency + * Sat Apr 11 2020 Markku Korkeala - 1:1.9.0-0.beta3.1 - Update to upstream release 1.9.0-beta3 - Switch to use maven building diff --git a/sources b/sources index 5ca6127..892d9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.9.0-beta3.zip) = b118c3090d1dc195b32b42ae0f657b269850c2e5125de75e5da79f1587d3b6199ed3dbd9720df1506c67ef26c2a4758ded4792e3939a03346206a8a1078f077b +SHA512 (clojure-1.9.0.zip) = 217e5cc66901ba67eedaae364fc5492724242da33f0e34ceed923f1664f123ab70a364602ccc20cdf81cbd32a357441cab5b9289c192957e37c384e6cf9d7449 From 799faa0e728a22879ae6a07a65faddd204e283cd Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Wed, 15 Apr 2020 20:10:47 +0300 Subject: [PATCH 35/66] Update to upstream release 1.10.1 Update clojure-spec-alpha and clojure-core-specs-alpha dependency Remove jsr166y pom_remove_dep --- .gitignore | 1 + clojure.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5984b02..7b5f88b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /clojure-1.9.0-alpha15.zip /clojure-1.9.0-beta3.zip /clojure-1.9.0.zip +/clojure-1.10.1.zip diff --git a/clojure.spec b/clojure.spec index 156ab86..bdb2439 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 -Version: 1.9.0 +Version: 1.10.1 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -24,8 +24,8 @@ BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.8.0 BuildRequires: sonatype-oss-parent -BuildRequires: clojure-spec-alpha >= 1:0.1.143 -BuildRequires: clojure-core-specs-alpha >= 1:0.1.24-2 +BuildRequires: clojure-spec-alpha >= 1:0.2.176 +BuildRequires: clojure-core-specs-alpha >= 1:0.2.44 BuildRequires: clojure-maven-plugin >= 1.8.1 BuildRequires: maven-compiler-plugin BuildRequires: maven-jar-plugin @@ -38,8 +38,8 @@ BuildRequires: maven-antrun-plugin Requires: java-headless >= 1:1.8 Requires: objectweb-asm -Requires: clojure-spec-alpha >= 1:0.1.143 -Requires: clojure-core-specs-alpha >= 1:0.1.24-2 +Requires: clojure-spec-alpha >= 1:0.2.176 +Requires: clojure-core-specs-alpha >= 1:0.2.44 %description Clojure is a dynamic programming language that targets the Java @@ -55,7 +55,6 @@ can avoid reflection. %prep %setup -q -n %{archivename}-%{full_version} -%pom_remove_dep org.codehaus.jsr166-mirror:jsr166y %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin %build @@ -74,6 +73,11 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Wed Apr 15 2020 Markku Korkeala - 1:1.10.1-1 +- Update to upstream release 1.10.1 +- Update clojure-spec-alpha and clojure-core-specs-alpha dependency +- Remove jsr166y pom_remove_dep + * Tue Apr 14 2020 Markku Korkeala - 1:1.9.0-1 - Update to upstream release 1.9.0, update clojure-spec-alpha dependency diff --git a/sources b/sources index 892d9f1..1e45be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.9.0.zip) = 217e5cc66901ba67eedaae364fc5492724242da33f0e34ceed923f1664f123ab70a364602ccc20cdf81cbd32a357441cab5b9289c192957e37c384e6cf9d7449 +SHA512 (clojure-1.10.1.zip) = 75453cbf87c6f129fc21bd130ec0c3093fa84493d1dcee3a55597b13785e3d0e57b3fd77dbc1c9fd46c0c09d1e2c40ec5a3324765015605b0fb77bda921529cc From 172843c3de4611e6b5ab33713a47fb4f9e78e5e2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 May 2020 12:42:42 +0200 Subject: [PATCH 36/66] regenerate BuildRequires with xmvn-builddep and drop redundant Requires --- clojure.spec | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/clojure.spec b/clojure.spec index bdb2439..6e37c6e 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,44 +2,28 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version} Name: clojure Epoch: 1 Version: 1.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 URL: http://clojure.org/ -Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip Source1: clojure.sh BuildArch: noarch -BuildRequires: javapackages-tools BuildRequires: maven-local -BuildRequires: ant >= 1.6 -BuildRequires: objectweb-asm -BuildRequires: java-devel >= 1:1.8.0 -BuildRequires: sonatype-oss-parent -BuildRequires: clojure-spec-alpha >= 1:0.2.176 -BuildRequires: clojure-core-specs-alpha >= 1:0.2.44 -BuildRequires: clojure-maven-plugin >= 1.8.1 -BuildRequires: maven-compiler-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-antrun-plugin - -Requires: java-headless >= 1:1.8 -Requires: objectweb-asm -Requires: clojure-spec-alpha >= 1:0.2.176 -Requires: clojure-core-specs-alpha >= 1:0.2.44 +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.clojure:core.specs.alpha) +BuildRequires: mvn(org.clojure:spec.alpha) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %description Clojure is a dynamic programming language that targets the Java @@ -54,8 +38,10 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-%{full_version} -%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin +%setup -q -n %{archivename}-%{version} + +%pom_remove_plugin :maven-release-plugin +%pom_remove_plugin :nexus-staging-maven-plugin %build %mvn_build -f -j @@ -73,6 +59,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Fri May 01 2020 Fabio Valentini - 1:1.10.1-2 +- Remove unnecessary maven-release-plugin and drop redundant Requires. + * Wed Apr 15 2020 Markku Korkeala - 1:1.10.1-1 - Update to upstream release 1.10.1 - Update clojure-spec-alpha and clojure-core-specs-alpha dependency From 4742abe26e080be605a0fea25530f3f243142319 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sat, 2 May 2020 17:32:33 +0300 Subject: [PATCH 37/66] Use jpackage_script to generate clojure application shell script. --- clojure.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/clojure.spec b/clojure.spec index 6e37c6e..da50351 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,15 +6,13 @@ Name: clojure Epoch: 1 Version: 1.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip -Source1: clojure.sh - BuildArch: noarch BuildRequires: maven-local @@ -47,18 +45,21 @@ can avoid reflection. %mvn_build -f -j %install -# startup script -install -d -m 755 %{buildroot}%{_bindir} -install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %mvn_install +# startup script +%jpackage_script clojure.main "" "" clojure:clojure-spec-alpha:clojure-core-specs-alpha clojure false + %files -f .mfiles %license epl-v10.html %doc changes.md readme.txt %{_bindir}/%{name} %changelog +* Sat May 02 2020 Markku Korkeala - 1:1.10.1-3 +- Use jpackage_script to generate clojure application shell script. + * Fri May 01 2020 Fabio Valentini - 1:1.10.1-2 - Remove unnecessary maven-release-plugin and drop redundant Requires. From 5d5f0888fe1eb2a1ed1621929d09e47cce67f8c9 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 17:25:59 +0200 Subject: [PATCH 38/66] Rebuilt for JDK-11 --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index da50351..88858bb 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -57,6 +57,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Fri Jul 10 2020 Jiri Vanek - 1:1.10.1-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Sat May 02 2020 Markku Korkeala - 1:1.10.1-3 - Use jpackage_script to generate clojure application shell script. From 65c64b56fdd868ff34b17f31929dc9914cbbcd6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:07:12 +0000 Subject: [PATCH 39/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 88858bb..0a150d3 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -57,6 +57,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1:1.10.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1:1.10.1-4 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From c964d16ebdf6346a70e4d154f6f99eb899083541 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sun, 17 Jan 2021 18:54:25 +0200 Subject: [PATCH 40/66] Add javapackages-tools dependency to fix wrapper script. --- clojure.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 0a150d3..44ff2ea 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -22,6 +22,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.clojure:core.specs.alpha) BuildRequires: mvn(org.clojure:spec.alpha) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +Requires: javapackages-tools %description Clojure is a dynamic programming language that targets the Java @@ -57,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sun Jan 17 2021 Markku Korkeala - 1:1.10.1-6 +- Add javapackages-tools dependency to fix wrapper script. + * Mon Jul 27 2020 Fedora Release Engineering - 1:1.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a73063328cecfd1bf010f4c562712dfd8d44a0c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:07:20 +0000 Subject: [PATCH 41/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 44ff2ea..d0e9526 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:1.10.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 17 2021 Markku Korkeala - 1:1.10.1-6 - Add javapackages-tools dependency to fix wrapper script. From 7588aaf62ff3e15d7de941a8fadcbbc0c9b7255c Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Mon, 1 Feb 2021 12:35:32 +0200 Subject: [PATCH 42/66] Update to upstream release 1.10.2 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7b5f88b..05a2eb3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /clojure-1.9.0-beta3.zip /clojure-1.9.0.zip /clojure-1.10.1.zip +/clojure-1.10.2.zip diff --git a/clojure.spec b/clojure.spec index d0e9526..c29dd1c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ Name: clojure Epoch: 1 -Version: 1.10.1 -Release: 7%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sat Jan 30 2021 Markku Korkeala - 1:1.10.2-1 +- Update to upstream release 1.10.2 + * Tue Jan 26 2021 Fedora Release Engineering - 1:1.10.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 1e45be8..9217378 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.10.1.zip) = 75453cbf87c6f129fc21bd130ec0c3093fa84493d1dcee3a55597b13785e3d0e57b3fd77dbc1c9fd46c0c09d1e2c40ec5a3324765015605b0fb77bda921529cc +SHA512 (clojure-1.10.2.zip) = e5f7cc3a8c0b986e0f4defe3d7d0933f5a420cc6f21ccdde10717cb58e9aec63e7dc46c6d8b3fe9ee95669e6ad6c5fe1f1551244ad3de9e059d91eb79daeec42 From 46ec1cc3780e7e8cad1324107a48939dc27bda76 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sat, 6 Mar 2021 12:54:50 +0200 Subject: [PATCH 43/66] Update to upstream release 1.10.3 --- .gitignore | 1 + clojure.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 05a2eb3..ba09312 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /clojure-1.9.0.zip /clojure-1.10.1.zip /clojure-1.10.2.zip +/clojure-1.10.3.zip diff --git a/clojure.spec b/clojure.spec index c29dd1c..5feb64c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,7 +5,7 @@ Name: clojure Epoch: 1 -Version: 1.10.2 +Version: 1.10.3 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sat Mar 06 2021 Markku Korkeala - 1:1.10.3-1 +- Update to upstream release 1.10.3 + * Sat Jan 30 2021 Markku Korkeala - 1:1.10.2-1 - Update to upstream release 1.10.2 diff --git a/sources b/sources index 9217378..4488475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.10.2.zip) = e5f7cc3a8c0b986e0f4defe3d7d0933f5a420cc6f21ccdde10717cb58e9aec63e7dc46c6d8b3fe9ee95669e6ad6c5fe1f1551244ad3de9e059d91eb79daeec42 +SHA512 (clojure-1.10.3.zip) = cc87f97768b5299bc8734efc34a9db0e81d1b5fd7a4f06cccb1b0574d123cae4e525d5d1f9720fa661deafed1cccb5a0d2c565eb7ac023eb1792c38477b6ecf2 From 0a61187c78cbb351022d0107e21d2ca644791ee7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:39:23 +0000 Subject: [PATCH 44/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f13a9f40142b905d21269f01838b59716487a297 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:36:53 +0000 Subject: [PATCH 45/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 5feb64c..7e31e8e 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1:1.10.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Mar 06 2021 Markku Korkeala - 1:1.10.3-1 - Update to upstream release 1.10.3 From e6aabc453ab41870d7289270e10e7d02d30536e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:23:20 +0000 Subject: [PATCH 46/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 7e31e8e..57f9975 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1:1.10.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1:1.10.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 636b6da269a5dcc19c06427a08421f68e81cabfa Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:56:56 +0100 Subject: [PATCH 47/66] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 57f9975..f8d247d 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.10.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:1.10.3-4 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1:1.10.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9848a4c0fca77d2dddd336a2cb944ff4d8becdbb Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Mon, 11 Apr 2022 12:51:29 +0300 Subject: [PATCH 48/66] Update to upstream release 1.11.1 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ba09312..ea820a4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /clojure-1.10.1.zip /clojure-1.10.2.zip /clojure-1.10.3.zip +/clojure-1.11.1.zip diff --git a/clojure.spec b/clojure.spec index f8d247d..7a40546 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ Name: clojure Epoch: 1 -Version: 1.10.3 -Release: 4%{?dist} +Version: 1.11.1 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -58,6 +58,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sun Apr 10 2022 Markku Korkeala - 1:1.11.1-1 +- Update to upstream release 1.11.1 + * Sat Feb 05 2022 Jiri Vanek - 1:1.10.3-4 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 4488475..a4e1ff6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.10.3.zip) = cc87f97768b5299bc8734efc34a9db0e81d1b5fd7a4f06cccb1b0574d123cae4e525d5d1f9720fa661deafed1cccb5a0d2c565eb7ac023eb1792c38477b6ecf2 +SHA512 (clojure-1.11.1.zip) = 838b04cf0203cee53a8ebe109814e72729dfa939ec9552d03d84768c354812909e8a1b9722552fa4065aa28ddf228a04c4daeb942cfa8871543d39723bd84a1f From 50dbda3c8db9b9c7380fcc37a5218642e988d5bb Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 14:43:53 +0200 Subject: [PATCH 49/66] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- clojure.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 7a40546..541ad99 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -14,6 +14,7 @@ URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -58,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Fri Jul 08 2022 Jiri Vanek - 1:1.11.1-2 +- Rebuilt for Drop i686 JDKs + * Sun Apr 10 2022 Markku Korkeala - 1:1.11.1-1 - Update to upstream release 1.11.1 From fc44ae1ef8542811abe3f3bfa8c6f90249caad3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:07:15 +0000 Subject: [PATCH 50/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 541ad99..6ac8e77 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1:1.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 1:1.11.1-2 - Rebuilt for Drop i686 JDKs From 19dbf19fb991f41d948b2eeaf125ee65530f83b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:02:42 +0000 Subject: [PATCH 51/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 6ac8e77..2c8c5c0 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1:1.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1:1.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e104ff7ddb3d8e74890eea8c875be7f169d28c92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:53:16 +0000 Subject: [PATCH 52/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 2c8c5c0..1f0381f 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1:1.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1:1.11.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 287bc1ade18cf8fff06984aa410bc29345610d50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:40:24 +0000 Subject: [PATCH 53/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 1f0381f..4308ff1 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1:1.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1:1.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 56037c2ad469471f7efb4255a763432cdb6e4bd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:28:34 +0000 Subject: [PATCH 54/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 4308ff1..dc1ba68 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1:1.11.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1:1.11.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eef5e014bd744416186358dbfeff6fad90dcb1c4 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sat, 27 Jan 2024 12:02:34 +0200 Subject: [PATCH 55/66] Add patch clj-2204 to mitigate CVE-2017-20189. --- clj-2204-disable-proxy-serialization.patch | 224 +++++++++++++++++++++ clj-2204.patch | 25 +++ clojure.spec | 11 +- 3 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 clj-2204-disable-proxy-serialization.patch create mode 100644 clj-2204.patch diff --git a/clj-2204-disable-proxy-serialization.patch b/clj-2204-disable-proxy-serialization.patch new file mode 100644 index 0000000..5edbe4a --- /dev/null +++ b/clj-2204-disable-proxy-serialization.patch @@ -0,0 +1,224 @@ +From c8d42afb5ec4fb5e2267aab3fb2d3af4a40df5d9 Mon Sep 17 00:00:00 2001 +From: Chouser +Date: Mon, 17 Jul 2017 23:04:41 -0400 +Subject: [PATCH] CLJ-2204 Disable serialization of proxy classes + +--- + src/clj/clojure/core_proxy.clj | 20 ++++++++++++++++++- + test/clojure/test_clojure/java_interop.clj | 31 +++++++++++++++++++++++++++++- + 2 files changed, 49 insertions(+), 2 deletions(-) + +diff --git a/src/clj/clojure/core_proxy.clj b/src/clj/clojure/core_proxy.clj +index 813c8bb..70d0528 100644 +--- a/src/clj/clojure/core_proxy.clj ++++ b/src/clj/clojure/core_proxy.clj +@@ -1,30 +1,31 @@ + ; Copyright (c) Rich Hickey. All rights reserved. + ; The use and distribution terms for this software are covered by the + ; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) + ; which can be found in the file epl-v10.html at the root of this distribution. + ; By using this software in any fashion, you are agreeing to be bound by + ; the terms of this license. + ; You must not remove this notice, or any other, from this software. + + (in-ns 'clojure.core) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + (import + '(clojure.asm ClassWriter ClassVisitor Opcodes Type) + '(java.lang.reflect Modifier Constructor) ++ '(java.io Serializable NotSerializableException) + '(clojure.asm.commons Method GeneratorAdapter) + '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT)) + + (defn method-sig [^java.lang.reflect.Method meth] + [(. meth (getName)) (seq (. meth (getParameterTypes))) (. meth getReturnType)]) + + (defn- most-specific [rtypes] + (or (some (fn [t] (when (every? #(isa? t %) rtypes) t)) rtypes) + (throw (Exception. "Incompatible return types")))) + + (defn- group-by-sig [coll] + "takes a collection of [msig meth] and returns a seq of maps from return-types to meths." + (vals (reduce1 (fn [m [msig meth]] + (let [rtype (peek msig) + argsig (pop msig)] +@@ -32,31 +33,32 @@ + {} coll))) + + (defn proxy-name + {:tag String} + [^Class super interfaces] + (let [inames (into1 (sorted-set) (map #(.getName ^Class %) interfaces))] + (apply str (.replace (str *ns*) \- \_) ".proxy" + (interleave (repeat "$") + (concat + [(.getName super)] + (map #(subs % (inc (.lastIndexOf ^String % "."))) inames) + [(Integer/toHexString (hash inames))]))))) + + (defn- generate-proxy [^Class super interfaces] + (let [cv (new ClassWriter (. ClassWriter COMPUTE_MAXS)) +- cname (.replace (proxy-name super interfaces) \. \/) ;(str "clojure/lang/" (gensym "Proxy__")) ++ pname (proxy-name super interfaces) ++ cname (.replace pname \. \/) ;(str "clojure/lang/" (gensym "Proxy__")) + ctype (. Type (getObjectType cname)) + iname (fn [^Class c] (.. Type (getType c) (getInternalName))) + fmap "__clojureFnMap" + totype (fn [^Class c] (. Type (getType c))) + to-types (fn [cs] (if (pos? (count cs)) + (into-array (map totype cs)) + (make-array Type 0))) + super-type ^Type (totype super) + imap-type ^Type (totype IPersistentMap) + ifn-type (totype clojure.lang.IFn) + obj-type (totype Object) + sym-type (totype clojure.lang.Symbol) + rt-type (totype clojure.lang.RT) + ex-type (totype java.lang.UnsupportedOperationException) + gen-bridge +@@ -136,30 +138,46 @@ + ;add ctors matching/calling super's + (doseq [^Constructor ctor (. super (getDeclaredConstructors))] + (when-not (. Modifier (isPrivate (. ctor (getModifiers)))) + (let [ptypes (to-types (. ctor (getParameterTypes))) + m (new Method "" (. Type VOID_TYPE) ptypes) + gen (new GeneratorAdapter (. Opcodes ACC_PUBLIC) m nil nil cv)] + (. gen (visitCode)) + ;call super ctor + (. gen (loadThis)) + (. gen (dup)) + (. gen (loadArgs)) + (. gen (invokeConstructor super-type m)) + + (. gen (returnValue)) + (. gen (endMethod))))) ++ ;disable serialization ++ (when (some #(isa? % Serializable) (cons super interfaces)) ++ (let [m (. Method (getMethod "void writeObject(java.io.ObjectOutputStream)")) ++ gen (new GeneratorAdapter (. Opcodes ACC_PRIVATE) m nil nil cv)] ++ (. gen (visitCode)) ++ (. gen (loadThis)) ++ (. gen (loadArgs)) ++ (. gen (throwException (totype NotSerializableException) pname)) ++ (. gen (endMethod))) ++ (let [m (. Method (getMethod "void readObject(java.io.ObjectInputStream)")) ++ gen (new GeneratorAdapter (. Opcodes ACC_PRIVATE) m nil nil cv)] ++ (. gen (visitCode)) ++ (. gen (loadThis)) ++ (. gen (loadArgs)) ++ (. gen (throwException (totype NotSerializableException) pname)) ++ (. gen (endMethod)))) + ;add IProxy methods + (let [m (. Method (getMethod "void __initClojureFnMappings(clojure.lang.IPersistentMap)")) + gen (new GeneratorAdapter (. Opcodes ACC_PUBLIC) m nil nil cv)] + (. gen (visitCode)) + (. gen (loadThis)) + (. gen (loadArgs)) + (. gen (putField ctype fmap imap-type)) + + (. gen (returnValue)) + (. gen (endMethod))) + (let [m (. Method (getMethod "void __updateClojureFnMappings(clojure.lang.IPersistentMap)")) + gen (new GeneratorAdapter (. Opcodes ACC_PUBLIC) m nil nil cv)] + (. gen (visitCode)) + (. gen (loadThis)) + (. gen (dup)) +diff --git a/test/clojure/test_clojure/java_interop.clj b/test/clojure/test_clojure/java_interop.clj +index 86ba5ca..44b5c70 100644 +--- a/test/clojure/test_clojure/java_interop.clj ++++ b/test/clojure/test_clojure/java_interop.clj +@@ -1,28 +1,29 @@ + ; Copyright (c) Rich Hickey. All rights reserved. + ; The use and distribution terms for this software are covered by the + ; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) + ; which can be found in the file epl-v10.html at the root of this distribution. + ; By using this software in any fashion, you are agreeing to be bound by + ; the terms of this license. + ; You must not remove this notice, or any other, from this software. + + ; Author: Frantisek Sodomka + + + (ns clojure.test-clojure.java-interop +- (:use clojure.test)) ++ (:use clojure.test) ++ (:require [clojure.inspector])) + + ; http://clojure.org/java_interop + ; http://clojure.org/compilation + + + (deftest test-dot + ; (.instanceMember instance args*) + (are [x] (= x "FRED") + (.toUpperCase "fred") + (. "fred" toUpperCase) + (. "fred" (toUpperCase)) ) + + (are [x] (= x true) + (.startsWith "abcde" "ab") + (. "abcde" startsWith "ab") +@@ -159,30 +160,58 @@ + (testing "That the proxy functions can chain" + (are [x y] (= x y) + (-> (get-proxy-class Object) + construct-proxy + (init-proxy {}) + (update-proxy {"toString" (fn [_] "chain chain chain")}) + str) + "chain chain chain" + + (-> (proxy [Object] [] (toString [] "superfuzz bigmuff")) + (update-proxy {"toString" (fn [_] "chain chain chain")}) + str) + "chain chain chain"))) + + ++;; serialized-proxy can be regenerated using a modified version of ++;; Clojure with the proxy serialization prohibition disabled and the ++;; following code: ++#_(let [baos (java.io.ByteArrayOutputStream.) ] ++ (with-open [baos baos] ++ (.writeObject (java.io.ObjectOutputStream. baos) (clojure.inspector/list-model nil))) ++ (println (apply str (for [c (String. (.toByteArray baos) "ISO-8859-1")] ++ (if (<= 32 (int c) (int \z)) c (format "\\%03o" (int c))))))) ++(def serialized-proxy "\254\355\000\005sr\000Eclojure.inspector.proxy$javax.swing.table.AbstractTableModel$ff19274art\330\266_\010ME\002\000\001L\000\016__clojureFnMapt\000\035Lclojure/lang/IPersistentMap;xr\000$javax.swing.table.AbstractTableModelr\313\3538\256\001\377\276\002\000\001L\000\014listenerListt\000%Ljavax/swing/event/EventListenerList;xpsr\000#javax.swing.event.EventListenerList\2616\306\175\204\352\326D\003\000\000xppxsr\000\037clojure.lang.PersistentArrayMap\3437p\017\230\305\364\337\002\000\002L\000\005_metaq\000\176\000\001[\000\005arrayt\000\023[Ljava/lang/Object;xr\000\033clojure.lang.APersistentMap]\174/\003t r\173\002\000\002I\000\005_hashI\000\007_hasheqxp\000\000\000\000\000\000\000\000pur\000\023[Ljava.lang.Object;\220\316X\237\020s)l\002\000\000xp\000\000\000\006t\000\016getColumnCountsr\000%clojure.inspector$list_model$fn__8816H\252\320\325b\371!+\002\000\000xr\000\026clojure.lang.AFunction>\006p\234\236F\375\313\002\000\001L\000\021__methodImplCachet\000\036Lclojure/lang/MethodImplCache;xppt\000\013getRowCountsr\000%clojure.inspector$list_model$fn__8818-\037I\247\234/U\226\002\000\001L\000\005nrowst\000\022Ljava/lang/Object;xq\000\176\000\017ppt\000\012getValueAtsr\000%clojure.inspector$list_model$fn__8820\323\331\174ke\233\370\034\002\000\002L\000\011get_labelq\000\176\000\024L\000\011get_valueq\000\176\000\024xq\000\176\000\017ppp") ++ ++(deftest test-proxy-non-serializable ++ (testing "That proxy classes refuse serialization and deserialization" ++ ;; Serializable listed directly in interface list: ++ (is (thrown? java.io.NotSerializableException ++ (-> (java.io.ByteArrayOutputStream.) ++ (java.io.ObjectOutputStream.) ++ (.writeObject (proxy [Object java.io.Serializable] []))))) ++ ;; Serializable included via inheritence: ++ (is (thrown? java.io.NotSerializableException ++ (-> (java.io.ByteArrayOutputStream.) ++ (java.io.ObjectOutputStream.) ++ (.writeObject (clojure.inspector/list-model nil))))) ++ ;; Deserialization also prohibited: ++ (is (thrown? java.io.NotSerializableException ++ (-> serialized-proxy (.getBytes "ISO-8859-1") ++ java.io.ByteArrayInputStream. java.io.ObjectInputStream. ++ .readObject))))) ++ + (deftest test-bases + (are [x y] (= x y) + (bases java.lang.Math) + (list java.lang.Object) + (bases java.util.Collection) + (list java.lang.Iterable) + (bases java.lang.Object) + nil + (bases java.lang.Comparable) + nil + (bases java.lang.Integer) + (list java.lang.Number java.lang.Comparable) )) + + (deftest test-supers + (are [x y] (= x y) +-- +2.9.3 + diff --git a/clj-2204.patch b/clj-2204.patch new file mode 100644 index 0000000..9a535f2 --- /dev/null +++ b/clj-2204.patch @@ -0,0 +1,25 @@ +From 3f5cf94eeac638a2993c98c786983918af5b8bbd Mon Sep 17 00:00:00 2001 +From: Alex Miller +Date: Wed, 12 Jul 2017 07:09:00 -0500 +Subject: [PATCH] CLJ-2204 Avoid AOT compilation of clojure.inspector which + creates classes susceptible to deserialization attacks + +--- + build.xml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/build.xml b/build.xml +index 0762853..dc38628 100644 +--- a/build.xml ++++ b/build.xml +@@ -64,7 +64,6 @@ + + + +- + + + +-- +2.9.0 + diff --git a/clojure.spec b/clojure.spec index 96d234c..8ac6f57 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -16,6 +16,10 @@ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zi Source1: clojure.sh +# Backport clj-2204, https://clojure.atlassian.net/browse/CLJ-2204 +Patch1: clj-2204-disable-proxy-serialization.patch +Patch2: clj-2204.patch + BuildArch: noarch BuildRequires: maven-local @@ -43,6 +47,8 @@ can avoid reflection. %prep %setup -q -n %{archivename}-%{version} +%patch -P 1 -p1 +%patch -P 2 -p1 %build ant -Dmaven.test.skip=1 @@ -72,6 +78,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Sat Jan 27 2024 Markku Korkeala - 1:1.8.0-2 +- Add patch clj-2204 to mitigate CVE-2017-20189. + * Thu Apr 2 2020 Markku Korkeala - 1:1.8.0-1 - New upstream release. - Replace add_maven_depmap macros with mvn_artifact and mvn_install From b147e6fc8bee6fdff659654f95f99f151a057def Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Fri, 15 Mar 2024 14:23:20 +0200 Subject: [PATCH 56/66] Update to upstream release 1.11.2 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ea820a4..bf02f03 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /clojure-1.10.2.zip /clojure-1.10.3.zip /clojure-1.11.1.zip +/clojure-1.11.2.zip diff --git a/clojure.spec b/clojure.spec index dc1ba68..66b9517 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ Name: clojure Epoch: 1 -Version: 1.11.1 -Release: 7%{?dist} +Version: 1.11.2 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Fri Mar 15 2024 Markku Korkeala - 1:1.11.2-1 +- Update to upstream release 1.11.2 + * Wed Jan 24 2024 Fedora Release Engineering - 1:1.11.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a4e1ff6..29fc68a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.11.1.zip) = 838b04cf0203cee53a8ebe109814e72729dfa939ec9552d03d84768c354812909e8a1b9722552fa4065aa28ddf228a04c4daeb942cfa8871543d39723bd84a1f +SHA512 (clojure-1.11.2.zip) = 014d7995fc532345fe4251a4644be2fd88f94b79e0d59139aee48f78f5963c2eda53499a26f3af9356eb832ee0207e6e8124a6d03f5b835a14901b67cc15add9 From b2a74e6e816c2dcf67c2a794accafb6bc052636b Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Wed, 3 Apr 2024 11:49:43 +0300 Subject: [PATCH 57/66] Backport patch for clj-2839 to mitigate CVE-2024-22871. --- ...LJ-2839-Infinite-seq-class-hashCode-.patch | 125 ++++++++++++++++++ clojure.spec | 9 +- 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 0001-Backport-patch-CLJ-2839-Infinite-seq-class-hashCode-.patch diff --git a/0001-Backport-patch-CLJ-2839-Infinite-seq-class-hashCode-.patch b/0001-Backport-patch-CLJ-2839-Infinite-seq-class-hashCode-.patch new file mode 100644 index 0000000..8b5e052 --- /dev/null +++ b/0001-Backport-patch-CLJ-2839-Infinite-seq-class-hashCode-.patch @@ -0,0 +1,125 @@ +From 5ed84f26da3c6b4d88c5efa1cadc0df30baed5a7 Mon Sep 17 00:00:00 2001 +From: Markku Korkeala +Date: Tue, 2 Apr 2024 19:30:49 +0300 +Subject: [PATCH] Backport patch CLJ-2839 Infinite seq class hashCode() is + infinite loop + +--- + src/clj/clojure/core.clj | 3 ++- + src/jvm/clojure/lang/Cycle.java | 8 ++++++++ + src/jvm/clojure/lang/Iterate.java | 7 +++++++ + src/jvm/clojure/lang/Repeat.java | 12 ++++++++++++ + test/clojure/test_clojure/sequences.clj | 11 +++++++++++ + test/clojure/test_clojure/serialization.clj | 10 +++++++++- + 6 files changed, 49 insertions(+), 2 deletions(-) + +diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj +index 32d04d8..6b858f3 100644 +--- a/src/clj/clojure/core.clj ++++ b/src/clj/clojure/core.clj +@@ -2902,7 +2902,8 @@ + [n x] (take n (repeat x))) + + (defn iterate +- "Returns a lazy sequence of x, (f x), (f (f x)) etc. f must be free of side-effects" ++ "Returns a lazy (infinite!) sequence of x, (f x), (f (f x)) etc. ++ f must be free of side-effects" + {:added "1.0" + :static true} + [f x] (clojure.lang.Iterate/create f x) ) +diff --git a/src/jvm/clojure/lang/Cycle.java b/src/jvm/clojure/lang/Cycle.java +index 3fae8af..8d8f21f 100644 +--- a/src/jvm/clojure/lang/Cycle.java ++++ b/src/jvm/clojure/lang/Cycle.java +@@ -91,4 +91,12 @@ public Object reduce(IFn f, Object start){ + s = all; + } + } ++public int hashCode(){ ++ throw new UnsupportedOperationException(); ++} ++ ++public int hasheq(){ ++ throw new UnsupportedOperationException(); ++} ++ + } +diff --git a/src/jvm/clojure/lang/Iterate.java b/src/jvm/clojure/lang/Iterate.java +index 2502383..973f396 100644 +--- a/src/jvm/clojure/lang/Iterate.java ++++ b/src/jvm/clojure/lang/Iterate.java +@@ -82,4 +82,11 @@ public Object reduce(IFn rf, Object start){ + v = f.invoke(v); + } + } ++public int hashCode(){ ++ throw new UnsupportedOperationException(); ++} ++ ++public int hasheq(){ ++ throw new UnsupportedOperationException(); ++} + } +diff --git a/src/jvm/clojure/lang/Repeat.java b/src/jvm/clojure/lang/Repeat.java +index 2e9de0e..62b36be 100644 +--- a/src/jvm/clojure/lang/Repeat.java ++++ b/src/jvm/clojure/lang/Repeat.java +@@ -94,5 +94,17 @@ public Object reduce(IFn f, Object start){ + return ret; + } + } ++public int hashCode(){ ++ if(count <= 0) ++ throw new UnsupportedOperationException(); ++ else ++ return super.hashCode(); ++} + ++public int hasheq(){ ++ if(count <= 0) ++ throw new UnsupportedOperationException(); ++ else ++ return super.hasheq(); ++} + } +diff --git a/test/clojure/test_clojure/sequences.clj b/test/clojure/test_clojure/sequences.clj +index e3adb27..420a834 100644 +--- a/test/clojure/test_clojure/sequences.clj ++++ b/test/clojure/test_clojure/sequences.clj +@@ -1343,3 +1343,14 @@ + (doseq [i (range 100)] + (is (= s1 (concat (subseq s2 < i) (subseq s2 >= i)))) + (is (= (reverse s1) (concat (rsubseq s2 >= i) (rsubseq s2 < i))))))) ++ ++(deftest infinite-seq-hash ++ (are [e] (thrown? Exception (.hashCode ^Object e)) ++ (iterate identity nil) ++ (cycle [1]) ++ (repeat 1)) ++ (are [e] (thrown? Exception (.hasheq ^clojure.lang.IHashEq e)) ++ (iterate identity nil) ++ (cycle [1]) ++ (repeat 1))) ++ +diff --git a/test/clojure/test_clojure/serialization.clj b/test/clojure/test_clojure/serialization.clj +index 60cd65c..3806a9e 100644 +--- a/test/clojure/test_clojure/serialization.clj ++++ b/test/clojure/test_clojure/serialization.clj +@@ -173,4 +173,12 @@ + + ;; stateful seqs + (enumeration-seq (java.util.Collections/enumeration (range 50))) +- (iterator-seq (.iterator (range 50))))) +\ No newline at end of file ++ (iterator-seq (.iterator (range 50))))) ++ ++;; necessary for CVE-2024-22871 ++(deftest CLJ-2839 ++ (are [e] (thrown? Exception (.hashCode ^Object (-> e serialize deserialize))) ++ (repeat 1) ++ (iterate identity nil) ++ (cycle [1]))) ++ +-- +2.44.0 + diff --git a/clojure.spec b/clojure.spec index 8ac6f57..613a434 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -19,6 +19,8 @@ Source1: clojure.sh # Backport clj-2204, https://clojure.atlassian.net/browse/CLJ-2204 Patch1: clj-2204-disable-proxy-serialization.patch Patch2: clj-2204.patch +# Backport clj-2839 https://clojure.atlassian.net/browse/CLJ-2839 +Patch3: 0001-Backport-patch-CLJ-2839-Infinite-seq-class-hashCode-.patch BuildArch: noarch @@ -49,6 +51,8 @@ can avoid reflection. %setup -q -n %{archivename}-%{version} %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 + %build ant -Dmaven.test.skip=1 @@ -78,6 +82,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Apr 3 2024 Markku Korkeala - 1:1.8.0-3 +- Backport patch for clj-2839 to mitigate CVE-2024-22871. + * Sat Jan 27 2024 Markku Korkeala - 1:1.8.0-2 - Add patch clj-2204 to mitigate CVE-2017-20189. From 3183b10e77542e5f1096844fdcec14efe422d837 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:29:48 +0000 Subject: [PATCH 58/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 66b9517..5085e23 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1:1.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Mar 15 2024 Markku Korkeala - 1:1.11.2-1 - Update to upstream release 1.11.2 From 238583dcf7dbec3ef06857934c26e515b53d66ee Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Tue, 8 Oct 2024 15:50:01 +0300 Subject: [PATCH 59/66] Update to upstream release 1.11.3 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf02f03..dcd22ee 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /clojure-1.10.3.zip /clojure-1.11.1.zip /clojure-1.11.2.zip +/clojure-1.11.3.zip diff --git a/clojure.spec b/clojure.spec index 5085e23..b516df2 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ Name: clojure Epoch: 1 -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.3 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Tue Oct 8 2024 Markku Korkeala - 1:1.11.3-1 +- Update to upstream release 1.11.3 + * Wed Jul 17 2024 Fedora Release Engineering - 1:1.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 29fc68a..473399f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.11.2.zip) = 014d7995fc532345fe4251a4644be2fd88f94b79e0d59139aee48f78f5963c2eda53499a26f3af9356eb832ee0207e6e8124a6d03f5b835a14901b67cc15add9 +SHA512 (clojure-1.11.3.zip) = 213927bea86d338a0189773369553cba299764fcb851934fa85d28adb9bbed1b77a04643cf13a1075ee1334b8e9e7a817fa9576b2f4715ea42a0003f7fb76407 From 2e29ce9772c00053ae7761345f664423982241f2 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Fri, 11 Oct 2024 11:20:46 +0300 Subject: [PATCH 60/66] Update to upstream release 1.12.0, closes rhbz#2186974 --- .gitignore | 1 + clojure.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dcd22ee..59a8af9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /clojure-1.11.1.zip /clojure-1.11.2.zip /clojure-1.11.3.zip +/clojure-1.12.0.zip diff --git a/clojure.spec b/clojure.spec index b516df2..4668846 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,7 +5,7 @@ Name: clojure Epoch: 1 -Version: 1.11.3 +Version: 1.12.0 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Fri Oct 11 2024 Markku Korkeala - 1:1.12.0-1 +- Update to upstream release 1.12.0, closes rhbz#2186974 + * Tue Oct 8 2024 Markku Korkeala - 1:1.11.3-1 - Update to upstream release 1.11.3 diff --git a/sources b/sources index 473399f..6fc812e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.11.3.zip) = 213927bea86d338a0189773369553cba299764fcb851934fa85d28adb9bbed1b77a04643cf13a1075ee1334b8e9e7a817fa9576b2f4715ea42a0003f7fb76407 +SHA512 (clojure-1.12.0.zip) = d0f36491bf2fee9906951f84591c9462d2ef2e36bd22cf1856c724f92d055ad1cd790e50e702f192f0d911d0ff4f8bf8e4c360c0ded94e317fec2f657731b5d4 From 2c607699da7f39ae2cfd40e97ceeddc7e5d712cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:57:31 +0000 Subject: [PATCH 61/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 4668846..79229df 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1:1.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 11 2024 Markku Korkeala - 1:1.12.0-1 - Update to upstream release 1.12.0, closes rhbz#2186974 From 5f5460e5db602c35785316b32fff53c7c6fb95af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:24:44 +0000 Subject: [PATCH 62/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 79229df..3418720 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1:1.12.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1:1.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f8569c26e60b0086f9465d0277f1519d849c0c53 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:55:32 +0200 Subject: [PATCH 63/66] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- clojure.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clojure.spec b/clojure.spec index 3418720..b3d1fd7 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.12.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -16,7 +16,7 @@ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zi BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) @@ -59,6 +59,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Tue Jul 29 2025 jiri vanek - 1:1.12.0-4 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 1:1.12.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d7b15410bc66950939179fc7f0093fb2c87b5235 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sun, 23 Nov 2025 13:49:08 +0200 Subject: [PATCH 64/66] Update to upstream release 1.12.3, closes rhbz#2186974 Remove central-publishing-maven-plugin from pom Remove maven-javadoc-plugin from pom --- .gitignore | 1 + clojure.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 59a8af9..3a802b5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /clojure-1.11.2.zip /clojure-1.11.3.zip /clojure-1.12.0.zip +/clojure-1.12.3.zip diff --git a/clojure.spec b/clojure.spec index b3d1fd7..2ce5064 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ Name: clojure Epoch: 1 -Version: 1.12.0 -Release: 4%{?dist} +Version: 1.12.3 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -41,7 +41,9 @@ can avoid reflection. %setup -q -n %{archivename}-%{version} %pom_remove_plugin :maven-release-plugin -%pom_remove_plugin :nexus-staging-maven-plugin +%pom_remove_plugin :central-publishing-maven-plugin +%pom_remove_plugin :maven-javadoc-plugin + %build %mvn_build -f -j @@ -59,6 +61,11 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Sun Nov 23 2025 Markku Korkeala - 1:1.12.3-1 +- Update to upstream release 1.12.3, closes rhbz#2186974 +- Remove central-publishing-maven-plugin from pom +- Remove maven-javadoc-plugin from pom + * Tue Jul 29 2025 jiri vanek - 1:1.12.0-4 - Rebuilt for java-25-openjdk as preffered jdk diff --git a/sources b/sources index 6fc812e..0cf6a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.12.0.zip) = d0f36491bf2fee9906951f84591c9462d2ef2e36bd22cf1856c724f92d055ad1cd790e50e702f192f0d911d0ff4f8bf8e4c360c0ded94e317fec2f657731b5d4 +SHA512 (clojure-1.12.3.zip) = 602050423059e612cac8331a27383ce26ef87b56912e6a2b659e9e99a6a1b1fd7b44489ff6f9dabe36f98c6cf7dbfc344e3bc2fcdaaedb51dfa3694b3dbf28e4 From 47abcba827471a8f36e66d2f1d03de95d001daf6 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Tue, 9 Dec 2025 16:46:16 +0200 Subject: [PATCH 65/66] Remove timestamp modifications from jar, closes to rhbz#2355949 --- clojure.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 2ce5064..d5876dc 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,11 +2,12 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} +%define add_determinism_options --handler=-jar Name: clojure Epoch: 1 Version: 1.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -61,6 +62,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Tue Dec 09 2025 Markku Korkeala - 1:1.12.3-2 +- Remove timestamp modifications from jar, closes to rhbz#2355949 + * Sun Nov 23 2025 Markku Korkeala - 1:1.12.3-1 - Update to upstream release 1.12.3, closes rhbz#2186974 - Remove central-publishing-maven-plugin from pom From 98af8793de3f3d36e6fdd849d8a740a65b1caa9b Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Thu, 15 Jan 2026 15:29:23 +0200 Subject: [PATCH 66/66] Update to upstream release 1.12.4, closes rhbz#2369851 --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3a802b5..51ac2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /clojure-1.11.3.zip /clojure-1.12.0.zip /clojure-1.12.3.zip +/clojure-1.12.4.zip diff --git a/clojure.spec b/clojure.spec index d5876dc..550b009 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,8 +6,8 @@ Name: clojure Epoch: 1 -Version: 1.12.3 -Release: 2%{?dist} +Version: 1.12.4 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine License: EPL-1.0 @@ -62,6 +62,9 @@ can avoid reflection. %{_bindir}/%{name} %changelog +* Thu Jan 15 2026 Markku Korkeala - 1:1.12.4-1 +- Update to upstream release 1.12.4, closes rhbz#2369851 + * Tue Dec 09 2025 Markku Korkeala - 1:1.12.3-2 - Remove timestamp modifications from jar, closes to rhbz#2355949 diff --git a/sources b/sources index 0cf6a1e..4a227e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.12.3.zip) = 602050423059e612cac8331a27383ce26ef87b56912e6a2b659e9e99a6a1b1fd7b44489ff6f9dabe36f98c6cf7dbfc344e3bc2fcdaaedb51dfa3694b3dbf28e4 +SHA512 (clojure-1.12.4.zip) = e1629a330426f694ec9da11957a17fce1504175a0e801402ddc053a695e7f95c0fdc1af746897c80a37f5d2084a571034027e869a683dfebfef92b7af3598320