From b18eeb35b15ef6f5ad8b658a2953ce332da48b73 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 23 Oct 2008 14:33:01 +0000 Subject: [PATCH 001/100] Initial import --- .cvsignore | 1 + clojure.sh | 7 +++++ clojure.spec | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 85 insertions(+) create mode 100644 clojure.sh create mode 100644 clojure.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..870d8ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +clojure_20080916.zip diff --git a/clojure.sh b/clojure.sh new file mode 100644 index 0000000..fce9f65 --- /dev/null +++ b/clojure.sh @@ -0,0 +1,7 @@ +#!/bin/bash +clojure="java ${JAVA_OPTS} -cp /usr/share/java/clojure.jar:${CLASSPATH}" +if test -z "$1"; then + exec ${clojure} clojure.lang.Repl /usr/share/clojure/boot.clj +else + exec ${clojure} clojure.lang.Script /usr/share/clojure/boot.clj "$@" +fi \ No newline at end of file diff --git a/clojure.spec b/clojure.spec new file mode 100644 index 0000000..96daca7 --- /dev/null +++ b/clojure.spec @@ -0,0 +1,75 @@ +Name: clojure +Version: 20080916 +Release: 1%{?dist} +Summary: A dynamic programming language that targets the Java Virtual Machine + +Group: Development/Languages +License: CPL +URL: http://clojure.org/ +Source0: http://downloads.sourceforge.net/clojure/clojure_20080916.zip +Source1: clojure.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: ant >= 1.6 +BuildRequires: jpackage-utils >= 1.5 +BuildRequires: objectweb-asm + +Requires: java >= 1:1.6 +Requires: objectweb-asm + +%description +Clojure is a dynamic programming language that targets the Java +Virtual Machine. It is designed to be a general-purpose language, +combining the approachability and interactive development of a +scripting language with an efficient and robust infrastructure for +multithreaded programming. Clojure is a compiled language - it +compiles directly to JVM bytecode, yet remains completely +dynamic. Every feature supported by Clojure is supported at +runtime. Clojure provides easy access to the Java frameworks, with +optional type hints and type inference, to ensure that calls to Java +can avoid reflection. + +%prep +%setup -q -c -n clojure-%{version} + +rm -f *.jar + +%build +ant jar + +%install +rm -rf %{buildroot} + +chmod 644 CPL.TXT + +# prefix install +install -p -d -m 755 %{buildroot}%{_datadir}/%{name} +cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ +rm -f %{buildroot}%{_datadir}/%{name}/xml/\#* + +# jar - link to prefix'd jar so that java stuff knows where to look +install -d -m 755 %{buildroot}%{_javadir} +cp clojure.jar %{buildroot}%{_javadir}/%{name}.jar + +# startup script +install -d -m 755 %{buildroot}%{_bindir} +cp %{SOURCE1} %{buildroot}%{_bindir}/clojure + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc CPL.TXT readme.txt + +%attr(0755,root,root) %{_bindir}/clojure +%{_javadir}/%{name}.jar +%{_datadir}/%{name} +%{_bindir}/clojure + +%changelog +* Tue Sep 30 2008 Colin Walters - 20080916-1.fc10 +- initial version + diff --git a/import.log b/import.log new file mode 100644 index 0000000..a5afd3b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +clojure-20080916-1_fc10:HEAD:clojure-20080916-1.fc10.src.rpm:1224772058 diff --git a/sources b/sources index e69de29..20c52fd 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +289c08f9c8cab51615623704b65048cf clojure_20080916.zip From 606e68c6e62d13154ba36855a535605b2c4cbeb7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 24 Oct 2008 13:19:31 +0000 Subject: [PATCH 002/100] - BR OpenJDK, we need 1.6 --- clojure.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 96daca7..41bfc58 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure Version: 20080916 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -14,6 +14,7 @@ BuildArch: noarch BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm +BuildRequires: java >= 1:1.6.0 Requires: java >= 1:1.6 Requires: objectweb-asm @@ -70,6 +71,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Fri Oct 24 2008 Colin Walters - 20080916-2.fc10 +- BR OpenJDK, we need 1.6 + * Tue Sep 30 2008 Colin Walters - 20080916-1.fc10 - initial version From 9a8da248cd73ab9ce0ae1f1ebbf7386c79a0b0cc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 24 Oct 2008 13:26:33 +0000 Subject: [PATCH 003/100] BR devel --- clojure.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 41bfc58..d0b044e 100644 --- a/clojure.spec +++ b/clojure.spec @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm -BuildRequires: java >= 1:1.6.0 +BuildRequires: java-devel >= 1:1.6.0 Requires: java >= 1:1.6 Requires: objectweb-asm From 11bf0aacf7f59049b94660fcdd342f4a5a4ae599 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 18 Dec 2008 14:33:54 +0000 Subject: [PATCH 004/100] - New upstream --- .cvsignore | 2 +- clojure.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 870d8ec..e28e819 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clojure_20080916.zip +clojure_20081217.zip diff --git a/clojure.spec b/clojure.spec index d0b044e..dc7026b 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure -Version: 20080916 -Release: 2%{?dist} +Version: 20081217 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -71,9 +71,12 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog -* Fri Oct 24 2008 Colin Walters - 20080916-2.fc10 +* Thu Dec 18 2008 Colin Walters - 20081217-1 +- New upstream + +* Fri Oct 24 2008 Colin Walters - 20080916-2 - BR OpenJDK, we need 1.6 -* Tue Sep 30 2008 Colin Walters - 20080916-1.fc10 +* Tue Sep 30 2008 Colin Walters - 20080916-1 - initial version diff --git a/sources b/sources index 20c52fd..3f9ab92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -289c08f9c8cab51615623704b65048cf clojure_20080916.zip +cf0f4c27d30ae7cd675f401e169b17e7 clojure_20081217.zip From ee3eba5172de63416a2176e95fcac18a1d307898 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 18 Dec 2008 14:38:45 +0000 Subject: [PATCH 005/100] ref version in spec --- clojure.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index dc7026b..ab5bd62 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Summary: A dynamic programming language that targets the Java Virtual Mac Group: Development/Languages License: CPL URL: http://clojure.org/ -Source0: http://downloads.sourceforge.net/clojure/clojure_20080916.zip +Source0: http://downloads.sourceforge.net/clojure/clojure_%{version}.zip Source1: clojure.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From ab9ccf263b1f1fd3a3b796a71668b6991314342b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 18 Dec 2008 15:24:59 +0000 Subject: [PATCH 006/100] fix startup script, cd to right dir --- clojure.sh | 7 +------ clojure.spec | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/clojure.sh b/clojure.sh index fce9f65..4ef2bc6 100644 --- a/clojure.sh +++ b/clojure.sh @@ -1,7 +1,2 @@ #!/bin/bash -clojure="java ${JAVA_OPTS} -cp /usr/share/java/clojure.jar:${CLASSPATH}" -if test -z "$1"; then - exec ${clojure} clojure.lang.Repl /usr/share/clojure/boot.clj -else - exec ${clojure} clojure.lang.Script /usr/share/clojure/boot.clj "$@" -fi \ No newline at end of file +exec java ${JAVA_OPTS} -jar /usr/share/java/clojure.jar "$@" diff --git a/clojure.spec b/clojure.spec index ab5bd62..142eb03 100644 --- a/clojure.spec +++ b/clojure.spec @@ -33,17 +33,17 @@ can avoid reflection. %prep %setup -q -c -n clojure-%{version} - +cd clojure rm -f *.jar %build +cd clojure ant jar %install +cd clojure rm -rf %{buildroot} -chmod 644 CPL.TXT - # prefix install install -p -d -m 755 %{buildroot}%{_datadir}/%{name} cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ @@ -63,7 +63,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc CPL.TXT readme.txt +%doc clojure/readme.txt %attr(0755,root,root) %{_bindir}/clojure %{_javadir}/%{name}.jar From 78738be94a4cce56ea958f3bed743db0d237d85d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 07:55:58 +0000 Subject: [PATCH 007/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 142eb03..34b7773 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure Version: 20081217 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 20081217-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Dec 18 2008 Colin Walters - 20081217-1 - New upstream From 4c28ac76dee2682e12ba2ac95dae3023bb048b8c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 20 Mar 2009 16:52:35 +0000 Subject: [PATCH 008/100] - New upstream --- .cvsignore | 2 +- clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e28e819..ea40651 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clojure_20081217.zip +clojure_20090320.zip diff --git a/clojure.spec b/clojure.spec index 34b7773..e210973 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure -Version: 20081217 -Release: 2%{?dist} +Version: 20090320 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Fri Mar 20 2009 Colin Walters - 20090320 +- New upstream + * Tue Feb 24 2009 Fedora Release Engineering - 20081217-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 3f9ab92..1344bd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf0f4c27d30ae7cd675f401e169b17e7 clojure_20081217.zip +0bbd1f6f889dded06ce0fe18381f150c clojure_20090320.zip From ce008b632ce5fa864a51a907ebd5184a9b56903b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 19:06:45 +0000 Subject: [PATCH 009/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index e210973..67e0481 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure Version: 20090320 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 20090320-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 20 2009 Colin Walters - 20090320 - New upstream From 4ee019c88df5286cf54f40b886997d00ff60add9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:47:33 +0000 Subject: [PATCH 010/100] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e1c37d5..7c3fc07 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: clojure -# $Id$ +# $Id: Makefile,v 1.1 2008/10/16 17:04:32 kevin Exp $ NAME := clojure SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8157aaecc60e0c69553be7210d32e64fa29e4803 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 1 Dec 2009 21:04:30 +0000 Subject: [PATCH 011/100] New upstream release --- clojure.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/clojure.spec b/clojure.spec index 67e0481..be2b00f 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,13 +1,17 @@ + Name: clojure -Version: 20090320 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages -License: CPL +License: EPL URL: http://clojure.org/ -Source0: http://downloads.sourceforge.net/clojure/clojure_%{version}.zip +Source0: http://clojure.googlecode.com/files/clojure_%{version}.zip Source1: clojure.sh + +Patch1: clojure-1.0.0-no_classpath.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,16 +36,14 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -c -n clojure-%{version} -cd clojure +%setup -q -c -n clojure rm -f *.jar +%patch1 -p1 %build -cd clojure ant jar %install -cd clojure rm -rf %{buildroot} # prefix install @@ -60,10 +62,9 @@ cp %{SOURCE1} %{buildroot}%{_bindir}/clojure %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) -%doc clojure/readme.txt +%doc readme.txt epl-v10.html %attr(0755,root,root) %{_bindir}/clojure %{_javadir}/%{name}.jar @@ -71,6 +72,10 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Tue Dec 1 2009 Jochen Schmitt 1.0.0-1 +- New upstream release +- change license tag to EPL + * Fri Jul 24 2009 Fedora Release Engineering - 20090320-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From ab70afe8ede441352acfc2055e69b07e798ebb32 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 1 Dec 2009 21:05:43 +0000 Subject: [PATCH 012/100] Add forgotten patch --- clojure-1.0.0-no_classpath.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 clojure-1.0.0-no_classpath.patch diff --git a/clojure-1.0.0-no_classpath.patch b/clojure-1.0.0-no_classpath.patch new file mode 100644 index 0000000..479c3ba --- /dev/null +++ b/clojure-1.0.0-no_classpath.patch @@ -0,0 +1,18 @@ +--- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath 2009-05-04 19:23:20.000000000 -0400 ++++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml 2009-09-29 06:39:34.151649990 -0400 +@@ -104,7 +104,6 @@ + + + +- + + + +@@ -122,7 +121,6 @@ + + + +- + + + From 2df46473e408c254914ec2c0641546725a312593 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 1 Dec 2009 21:12:59 +0000 Subject: [PATCH 013/100] forgottten uploading sources --- .cvsignore | 2 +- clojure.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ea40651..a81579e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clojure_20090320.zip +clojure_1.0.0.zip diff --git a/clojure.spec b/clojure.spec index be2b00f..02c030e 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,7 +1,7 @@ Name: clojure Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -72,6 +72,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Tue Dec 1 2009 Jochen Schmitt 1.0.0-2 +- Forgot uploading soruces + * Tue Dec 1 2009 Jochen Schmitt 1.0.0-1 - New upstream release - change license tag to EPL diff --git a/sources b/sources index 1344bd3..1fe2edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bbd1f6f889dded06ce0fe18381f150c clojure_20090320.zip +e7a50129040df7fe52287006988ecbb2 clojure_1.0.0.zip From f1b266b652aee6dca49a85c006ef4110c7569cdf Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 2 Dec 2009 16:05:55 +0000 Subject: [PATCH 014/100] add Epoch to get proper update path --- clojure.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 02c030e..3d7fe24 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,7 +1,8 @@ Name: clojure +Epoch: 1 Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -72,6 +73,9 @@ rm -rf %{buildroot} %{_bindir}/clojure %changelog +* Wed Dec 2 2009 Jochen Schmitt 1:1.0.0-3 +- Add Epoch to get proper EVR path + * Tue Dec 1 2009 Jochen Schmitt 1.0.0-2 - Forgot uploading soruces From 9f4da6843e3e83c05923e4dcb0ada6c7187840ee Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 2 Dec 2009 17:08:14 +0000 Subject: [PATCH 015/100] Put pom file into maven repository --- clojure.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 3d7fe24..0fdb9fb 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,7 +2,7 @@ Name: clojure Epoch: 1 Version: 1.0.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -60,9 +60,19 @@ cp clojure.jar %{buildroot}%{_javadir}/%{name}.jar install -d -m 755 %{buildroot}%{_bindir} cp %{SOURCE1} %{buildroot}%{_bindir}/clojure +install -d %{buildroot}%{_datadir}/maven2/poms +%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang +install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom + %clean rm -rf %{buildroot} +%post +%update_maven_depmap + +%postun +%update_maven_depmap + %files %defattr(-,root,root,-) %doc readme.txt epl-v10.html @@ -71,8 +81,13 @@ rm -rf %{buildroot} %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_bindir}/clojure +%{_datadir}/maven2/poms +%{_mavendepmapfragdir}/* %changelog +* Wed Dec 2 2009 Jochen Schmitt 1:1.0.0-5 +- Installing maven pom file + * Wed Dec 2 2009 Jochen Schmitt 1:1.0.0-3 - Add Epoch to get proper EVR path From 169a056e84c0bc549f97c48223029590da2807fd Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 20 Jan 2010 20:52:55 +0000 Subject: [PATCH 016/100] New upstream release --- .cvsignore | 2 +- ...th.patch => clojure-1.1.0-no_classpath.patch | 17 +++++++++++------ clojure.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) rename clojure-1.0.0-no_classpath.patch => clojure-1.1.0-no_classpath.patch (57%) diff --git a/.cvsignore b/.cvsignore index a81579e..c8ce12c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clojure_1.0.0.zip +clojure-1.1.0.zip diff --git a/clojure-1.0.0-no_classpath.patch b/clojure-1.1.0-no_classpath.patch similarity index 57% rename from clojure-1.0.0-no_classpath.patch rename to clojure-1.1.0-no_classpath.patch index 479c3ba..34e4ac0 100644 --- a/clojure-1.0.0-no_classpath.patch +++ b/clojure-1.1.0-no_classpath.patch @@ -1,18 +1,23 @@ ---- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath 2009-05-04 19:23:20.000000000 -0400 -+++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml 2009-09-29 06:39:34.151649990 -0400 -@@ -104,7 +104,6 @@ +diff -up clojure-1.1.0/build.xml.nc clojure-1.1.0/build.xml +--- clojure-1.1.0/build.xml.nc 2010-01-20 21:11:34.418625288 +0100 ++++ clojure-1.1.0/build.xml 2010-01-20 21:12:47.706636716 +0100 +@@ -114,8 +114,7 @@ - - +- ++ -@@ -122,7 +121,6 @@ + +@@ -145,8 +144,7 @@ - - +- ++ + diff --git a/clojure.spec b/clojure.spec index 0fdb9fb..81d139f 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,17 +1,17 @@ Name: clojure Epoch: 1 -Version: 1.0.0 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: http://clojure.googlecode.com/files/clojure_%{version}.zip +Source0: http://clojure.googlecode.com/files/clojure-%{version}.zip Source1: clojure.sh -Patch1: clojure-1.0.0-no_classpath.patch +Patch1: clojure-1.1.0-no_classpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,7 +37,7 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -c -n clojure +%setup -q rm -f *.jar %patch1 -p1 @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Wed Jan 20 2010 Jochen Schmitt 1:1.1.0-1 +- New upstream release + * Wed Dec 2 2009 Jochen Schmitt 1:1.0.0-5 - Installing maven pom file diff --git a/sources b/sources index 1fe2edf..ed5a44d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7a50129040df7fe52287006988ecbb2 clojure_1.0.0.zip +9c9e92f85351721b76f40578f5c1a94a clojure-1.1.0.zip From c78f94a8831ae271cc5f3fe70b3296b2d7265b80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:50:02 +0000 Subject: [PATCH 017/100] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7c3fc07..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: clojure -# $Id: Makefile,v 1.1 2008/10/16 17:04:32 kevin Exp $ -NAME := clojure -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index a5afd3b..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -clojure-20080916-1_fc10:HEAD:clojure-20080916-1.fc10.src.rpm:1224772058 From ec12107a66263a4ab1cf3e180e0d6c73b8863f9c Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 20 Aug 2010 17:48:32 +0200 Subject: [PATCH 018/100] - New upstream release --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8ce12c..5f87829 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ clojure-1.1.0.zip +/clojure-1.2.0.zip diff --git a/clojure.spec b/clojure.spec index 81d139f..4b50960 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,14 +1,14 @@ Name: clojure Epoch: 1 -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: http://clojure.googlecode.com/files/clojure-%{version}.zip +Source0: http://github.com/downloads/clojure/clojure/clojure-%{version}.zip Source1: clojure.sh Patch1: clojure-1.1.0-no_classpath.patch @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Fri Aug 20 2010 Jochen Schmitt 1:1.2.0-1 +- New upstream release + * Wed Jan 20 2010 Jochen Schmitt 1:1.1.0-1 - New upstream release diff --git a/sources b/sources index ed5a44d..6242e0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c9e92f85351721b76f40578f5c1a94a clojure-1.1.0.zip +da0cc71378f56491d6ee70dee356831f clojure-1.2.0.zip From 162b5803c47ac01d6530a859f2ba522075e8ca09 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:28:38 -0600 Subject: [PATCH 019/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 4b50960..771b172 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,7 +2,7 @@ Name: clojure Epoch: 1 Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1:1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Aug 20 2010 Jochen Schmitt 1:1.2.0-1 - New upstream release From feec238f80ad5afa077f223895dc35054ceb7140 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 12 Jul 2011 19:37:08 +0200 Subject: [PATCH 020/100] New minor bug fixing release from upstream --- .gitignore | 1 + clojure.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f87829..00900d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clojure-1.1.0.zip /clojure-1.2.0.zip +/clojure-1.2.1.zip diff --git a/clojure.spec b/clojure.spec index 4b50960..5e71d87 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,7 +1,7 @@ Name: clojure Epoch: 1 -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -42,7 +42,7 @@ rm -f *.jar %patch1 -p1 %build -ant jar +ant %install rm -rf %{buildroot} @@ -85,6 +85,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Tue Jul 12 2011 Jochen Schmitt 1:1.2.1-1 +- New minor bug fixing release from upstream + * Fri Aug 20 2010 Jochen Schmitt 1:1.2.0-1 - New upstream release diff --git a/sources b/sources index 6242e0f..adc2a96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da0cc71378f56491d6ee70dee356831f clojure-1.2.0.zip +c5724c624fd6ce6a1d00252c27d53ebe clojure-1.2.1.zip From f340876f3bfe479acde7ded4d250cf1db5edb9a9 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 21 Sep 2011 17:35:53 +0200 Subject: [PATCH 021/100] New upstrem release Remove no-classpath patch (#684060) --- .gitignore | 1 + clojure-1.1.0-no_classpath.patch | 23 ----------------------- clojure.spec | 16 ++++++++-------- sources | 2 +- 4 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 clojure-1.1.0-no_classpath.patch diff --git a/.gitignore b/.gitignore index 00900d4..b5953a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clojure-1.1.0.zip /clojure-1.2.0.zip /clojure-1.2.1.zip +/clojure-1.3.0-RC0.zip diff --git a/clojure-1.1.0-no_classpath.patch b/clojure-1.1.0-no_classpath.patch deleted file mode 100644 index 34e4ac0..0000000 --- a/clojure-1.1.0-no_classpath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up clojure-1.1.0/build.xml.nc clojure-1.1.0/build.xml ---- clojure-1.1.0/build.xml.nc 2010-01-20 21:11:34.418625288 +0100 -+++ clojure-1.1.0/build.xml 2010-01-20 21:12:47.706636716 +0100 -@@ -114,8 +114,7 @@ - - - -- -- -+ - - - -@@ -145,8 +144,7 @@ - - - -- -- -+ - - - diff --git a/clojure.spec b/clojure.spec index ba7d8c7..933b695 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,18 +1,15 @@ - Name: clojure Epoch: 1 -Version: 1.2.1 -Release: 1%{?dist} +Version: 1.3.0 +Release: 0.1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: http://github.com/downloads/clojure/clojure/clojure-%{version}.zip +Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}-RC0/clojure-%{version}-RC0.zip Source1: clojure.sh -Patch1: clojure-1.1.0-no_classpath.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,9 +34,8 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q +%setup -q -n clojure-%{version}-RC0 rm -f *.jar -%patch1 -p1 %build ant @@ -85,6 +81,10 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Wed Sep 21 2011 Jochen Schmitt 1:1.3.0-0.1 +- New upstrem release +- Remove no-classpath patch (#684060) + * Tue Jul 12 2011 Jochen Schmitt 1:1.2.1-1 - New minor bug fixing release from upstream diff --git a/sources b/sources index adc2a96..ac4fc78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5724c624fd6ce6a1d00252c27d53ebe clojure-1.2.1.zip +4944a5537f3008f053b181be2f111ac7 clojure-1.3.0-RC0.zip From 3896ef2bc03f0a68f8509e8370c144700d6f6968 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 22 Sep 2011 18:57:59 +0200 Subject: [PATCH 022/100] New upstrem release Remove no-classpath patch (#684060) Add patch to resolve JDK-1.7 related issues with test suite --- clojure-1.3.0-notest.patch | 19 +++++++++++++++++++ clojure.spec | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 clojure-1.3.0-notest.patch diff --git a/clojure-1.3.0-notest.patch b/clojure-1.3.0-notest.patch new file mode 100644 index 0000000..e1d2e26 --- /dev/null +++ b/clojure-1.3.0-notest.patch @@ -0,0 +1,19 @@ +diff -up clojure-1.3.0-RC0/build.xml.notest clojure-1.3.0-RC0/build.xml +--- clojure-1.3.0-RC0/build.xml.notest 2011-09-22 18:36:29.711661366 +0200 ++++ clojure-1.3.0-RC0/build.xml 2011-09-22 18:37:44.862656794 +0200 +@@ -94,6 +94,7 @@ + description="Run clojure tests without recompiling clojure." + depends="compile-tests" + unless="maven.test.skip"> ++ + + + 1:1.3.0-0.1 - New upstrem release - Remove no-classpath patch (#684060) +- Add patch to resolve JDK-1.7 related issues with test suite * Tue Jul 12 2011 Jochen Schmitt 1:1.2.1-1 - New minor bug fixing release from upstream From 819a20985841aebbd813fde321805d625903ce0d Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 25 Sep 2011 20:00:05 +0200 Subject: [PATCH 023/100] New upstream release Remove temp. patch to resolve JDK-1.7 issue --- .gitignore | 1 + clojure-1.3.0-notest.patch | 19 ------------------- clojure.spec | 15 +++++++-------- sources | 2 +- 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 clojure-1.3.0-notest.patch diff --git a/.gitignore b/.gitignore index b5953a2..20e7396 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clojure-1.1.0.zip /clojure-1.2.0.zip /clojure-1.2.1.zip /clojure-1.3.0-RC0.zip +/clojure-1.3.0.zip diff --git a/clojure-1.3.0-notest.patch b/clojure-1.3.0-notest.patch deleted file mode 100644 index e1d2e26..0000000 --- a/clojure-1.3.0-notest.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up clojure-1.3.0-RC0/build.xml.notest clojure-1.3.0-RC0/build.xml ---- clojure-1.3.0-RC0/build.xml.notest 2011-09-22 18:36:29.711661366 +0200 -+++ clojure-1.3.0-RC0/build.xml 2011-09-22 18:37:44.862656794 +0200 -@@ -94,6 +94,7 @@ - description="Run clojure tests without recompiling clojure." - depends="compile-tests" - unless="maven.test.skip"> -+ - - - 1:1.3.0-1 +- New upstream release +- Remove temp. patch to resolve JDK-1.7 issue + * Wed Sep 21 2011 Jochen Schmitt 1:1.3.0-0.1 - New upstrem release - Remove no-classpath patch (#684060) diff --git a/sources b/sources index ac4fc78..f2e6ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4944a5537f3008f053b181be2f111ac7 clojure-1.3.0-RC0.zip +de91ee9914017a38c7cc391ab8fcbc1a clojure-1.3.0.zip From 2646589462222090d12259558dff0c7372e68c81 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 17:29:22 -0600 Subject: [PATCH 024/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 6f9b9c3..f20ac9b 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,7 +1,7 @@ Name: clojure Epoch: 1 Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -81,6 +81,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1:1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Sep 25 2011 Jochen Schmitt 1:1.3.0-1 - New upstream release - Remove temp. patch to resolve JDK-1.7 issue From e0fd09e0b9a46fb5272b3e6ee056d84a410d2727 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 17 Apr 2012 22:09:23 +0200 Subject: [PATCH 025/100] New upstream release --- .gitignore | 1 + clojure.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 20e7396..90919ef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clojure-1.1.0.zip /clojure-1.2.1.zip /clojure-1.3.0-RC0.zip /clojure-1.3.0.zip +/clojure-1.4.0.zip diff --git a/clojure.spec b/clojure.spec index 6f9b9c3..df2a3bf 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,6 +1,6 @@ Name: clojure Epoch: 1 -Version: 1.3.0 +Version: 1.4.0 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -81,6 +81,9 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Tue Apr 17 2012 Jochen Schmitt 1:1.4.0-1 +- New upstream release + * Sun Sep 25 2011 Jochen Schmitt 1:1.3.0-1 - New upstream release - Remove temp. patch to resolve JDK-1.7 issue diff --git a/sources b/sources index f2e6ee5..33d3dee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de91ee9914017a38c7cc391ab8fcbc1a clojure-1.3.0.zip +db17baaea5bc90687c6293260499cca8 clojure-1.4.0.zip From 6edd7c6e95aa991d9cd0a267a758f1a38e145c6c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 7 Jun 2012 16:50:52 +0700 Subject: [PATCH 026/100] Update to better follow packaging guidelines --- .gitignore | 7 +----- clojure.spec | 60 ++++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 90919ef..68cd157 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -clojure-1.1.0.zip -/clojure-1.2.0.zip -/clojure-1.2.1.zip -/clojure-1.3.0-RC0.zip -/clojure-1.3.0.zip -/clojure-1.4.0.zip +/clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz diff --git a/clojure.spec b/clojure.spec index fe08e9c..883f8b7 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,16 +1,24 @@ +%global project clojure +%global groupId org.clojure +%global artifactId clojure +%global archivename %{project}-%{artifactId} +%global commit_hash 0ba3ff1 + Name: clojure Epoch: 1 Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}/clojure-%{version}.zip +# wget --content-disposition \ +# https://github.com/clojure/clojure/tarball/clojure-%{version} +Source0: %{project}-%{archivename}-%{version}-0-g%{commit_hash}.tar.gz + Source1: clojure.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: ant >= 1.6 @@ -34,53 +42,59 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -rm -f *.jar +%setup -q -n %{archivename}-8306949 %build ant %install -rm -rf %{buildroot} - +# EDIT this section does not seem to make any sense, it's all source files! # prefix install -install -p -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ -rm -f %{buildroot}%{_datadir}/%{name}/xml/\#* +#install -d -m 755 %{buildroot}%{_datadir}/%{name} +#cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ +#rm -f %{buildroot}%{_datadir}/%{name}/xml/\#* # jar - link to prefix'd jar so that java stuff knows where to look install -d -m 755 %{buildroot}%{_javadir} -cp clojure.jar %{buildroot}%{_javadir}/%{name}.jar +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} -cp %{SOURCE1} %{buildroot}%{_bindir}/clojure +install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} -install -d %{buildroot}%{_datadir}/maven2/poms -%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang -install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom +%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 %clean rm -rf %{buildroot} +%if 0%{?rhel} %post %update_maven_depmap %postun %update_maven_depmap +%endif %files -%defattr(-,root,root,-) -%doc readme.txt epl-v10.html - -%attr(0755,root,root) %{_bindir}/clojure -%{_javadir}/%{name}.jar -%{_datadir}/%{name} -%{_bindir}/clojure -%{_datadir}/maven2/poms +%doc epl-v10.html changes.md readme.txt +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* +%{_javadir}/%{name}.jar +%{_bindir}/clojure +#{_datadir}/%{name} %changelog +* Wed Jun 6 2012 Michel Salim - 1:1.4.0-2 +- Update to better follow packaging guidelines + * Tue Apr 17 2012 Jochen Schmitt 1:1.4.0-1 - New upstream release diff --git a/sources b/sources index 33d3dee..df55aa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db17baaea5bc90687c6293260499cca8 clojure-1.4.0.zip +3a8430bc1005613dead40ff3a6dbd723 clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz From 96597eb96e0e153e606b5ab9a1e6d78669c716c4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 7 Jun 2012 17:04:18 +0700 Subject: [PATCH 027/100] Use %{name} when listing the launcher script; make the spec more interchangeable with clojure-compat --- clojure.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clojure.spec b/clojure.spec index 883f8b7..5fad04c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -88,8 +88,7 @@ rm -rf %{buildroot} %{_mavenpomdir}/* %{_mavendepmapfragdir}/* %{_javadir}/%{name}.jar -%{_bindir}/clojure -#{_datadir}/%{name} +%{_bindir}/%{name} %changelog * Wed Jun 6 2012 Michel Salim - 1:1.4.0-2 From 3a1c4f195c4d214d6f63ba899ea28e7cf25078b2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 8 Jun 2012 00:51:37 +0700 Subject: [PATCH 028/100] Spec clean-up including having a direct dep to jpackage-utils not rebuilding as this is not a significant enough update --- clojure.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/clojure.spec b/clojure.spec index 5fad04c..40466ee 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,8 +5,8 @@ %global commit_hash 0ba3ff1 Name: clojure -Epoch: 1 -Version: 1.4.0 +Epoch: 1 +Version: 1.4.0 Release: 2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine @@ -26,6 +26,7 @@ BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 +Requires: jpackage-utils Requires: java >= 1:1.6 Requires: objectweb-asm @@ -48,12 +49,6 @@ can avoid reflection. ant %install -# EDIT this section does not seem to make any sense, it's all source files! -# prefix install -#install -d -m 755 %{buildroot}%{_datadir}/%{name} -#cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ -#rm -f %{buildroot}%{_datadir}/%{name}/xml/\#* - # 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} From 9526457a398c3ae123bf2b379c597995001e1b27 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:10:54 -0500 Subject: [PATCH 029/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 40466ee..ed9d1b6 100644 --- a/clojure.spec +++ b/clojure.spec @@ -7,7 +7,7 @@ Name: clojure Epoch: 1 Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1:1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jun 6 2012 Michel Salim - 1:1.4.0-2 - Update to better follow packaging guidelines From a562afe2ac37bfb973efd9929ae9f372105304a0 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 23 Dec 2012 20:56:04 +0100 Subject: [PATCH 030/100] New upstream release --- .gitignore | 2 ++ clojure.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 68cd157..a2b5e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz +/clojure-1.5.0-RC1.zip +/clojure-clojure-1.5.0-RC1.zip diff --git a/clojure.spec b/clojure.spec index ed9d1b6..4b238ff 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,12 +2,11 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global commit_hash 0ba3ff1 Name: clojure Epoch: 1 -Version: 1.4.0 -Release: 3%{?dist} +Version: 1.5.0 +Release: 0.RC1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -15,7 +14,7 @@ License: EPL URL: http://clojure.org/ # wget --content-disposition \ # https://github.com/clojure/clojure/tarball/clojure-%{version} -Source0: %{project}-%{archivename}-%{version}-0-g%{commit_hash}.tar.gz +Source0: %{archivename}-%{version}-RC1.zip Source1: clojure.sh @@ -43,9 +42,10 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-8306949 +%setup -q -n %{archivename}-%{version}-RC1 %build +./antsetup.sh ant %install @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Sun Dec 23 2012 Jochen Schmitt - 1:1.5.0-0.RC1 +- New upstream release + * Wed Jul 18 2012 Fedora Release Engineering - 1:1.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index df55aa0..b9af1ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a8430bc1005613dead40ff3a6dbd723 clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz +4d73f49b100b7442362b405a964d56db clojure-clojure-1.5.0-RC1.zip From 464c52196b0fcc80d1b993f4529ceb22d2b998d3 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 23 Dec 2012 21:13:29 +0100 Subject: [PATCH 031/100] Add BR to maven --- clojure.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/clojure.spec b/clojure.spec index 4b238ff..2404d22 100644 --- a/clojure.spec +++ b/clojure.spec @@ -20,6 +20,7 @@ Source1: clojure.sh BuildArch: noarch +BuildRequires: maven BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm From 17d17018003a44e1fa44a2c96b8b535f1f394117 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 23 Dec 2012 21:48:43 +0100 Subject: [PATCH 032/100] Suppress test step in build.xml --- clojure-1.5.0-notest.patch | 12 ++++++++++++ clojure.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 clojure-1.5.0-notest.patch diff --git a/clojure-1.5.0-notest.patch b/clojure-1.5.0-notest.patch new file mode 100644 index 0000000..2d12e02 --- /dev/null +++ b/clojure-1.5.0-notest.patch @@ -0,0 +1,12 @@ +diff -up clojure-clojure-1.5.0-RC1/build.xml.notest clojure-clojure-1.5.0-RC1/build.xml +--- clojure-clojure-1.5.0-RC1/build.xml.notest 2012-12-23 21:39:25.545596216 +0100 ++++ clojure-clojure-1.5.0-RC1/build.xml 2012-12-23 21:42:41.441613872 +0100 +@@ -130,7 +130,7 @@ + + + +- ++ + + diff --git a/clojure.spec b/clojure.spec index 2404d22..1eb2f40 100644 --- a/clojure.spec +++ b/clojure.spec @@ -18,6 +18,8 @@ Source0: %{archivename}-%{version}-RC1.zip Source1: clojure.sh +Patch1: clojure-1.5.0-notest.patch + BuildArch: noarch BuildRequires: maven @@ -44,9 +46,9 @@ can avoid reflection. %prep %setup -q -n %{archivename}-%{version}-RC1 +%patch1 -p1 -b .notest %build -./antsetup.sh ant %install From 641db01a27b6e2e349d80bab279f6b377c4628cb Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mon, 24 Dec 2012 10:57:41 +0100 Subject: [PATCH 033/100] Use -Dmaven.test.skip=1 to sip test run --- clojure-1.5.0-notest.patch | 12 ------------ clojure.spec | 10 +++++----- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 clojure-1.5.0-notest.patch diff --git a/clojure-1.5.0-notest.patch b/clojure-1.5.0-notest.patch deleted file mode 100644 index 2d12e02..0000000 --- a/clojure-1.5.0-notest.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up clojure-clojure-1.5.0-RC1/build.xml.notest clojure-clojure-1.5.0-RC1/build.xml ---- clojure-clojure-1.5.0-RC1/build.xml.notest 2012-12-23 21:39:25.545596216 +0100 -+++ clojure-clojure-1.5.0-RC1/build.xml 2012-12-23 21:42:41.441613872 +0100 -@@ -130,7 +130,7 @@ - - - -- -+ - - diff --git a/clojure.spec b/clojure.spec index 1eb2f40..d94cd5c 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.5.0 -Release: 0.RC1%{?dist} +Release: 0.RC1.1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -18,8 +18,6 @@ Source0: %{archivename}-%{version}-RC1.zip Source1: clojure.sh -Patch1: clojure-1.5.0-notest.patch - BuildArch: noarch BuildRequires: maven @@ -46,10 +44,9 @@ can avoid reflection. %prep %setup -q -n %{archivename}-%{version}-RC1 -%patch1 -p1 -b .notest %build -ant +ant -Dmaven.test.skip=1 %install # jar - link to prefix'd jar so that java stuff knows where to look @@ -89,6 +86,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Mon Dec 24 2012 Jochen Schmitt - 1:1.5.0-0.RC1.1 +- Use -Dmaven.test.skip=1 to sip test run + * Sun Dec 23 2012 Jochen Schmitt - 1:1.5.0-0.RC1 - New upstream release From e414205421410f838d1b5dc9077705d38a808eee Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 6 Feb 2013 19:39:27 +0100 Subject: [PATCH 034/100] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- clojure.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/clojure.spec b/clojure.spec index d94cd5c..08dc045 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.5.0 -Release: 0.RC1.1%{?dist} +Release: 0.RC1.1%{?dist}.1 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -20,7 +20,7 @@ Source1: clojure.sh BuildArch: noarch -BuildRequires: maven +BuildRequires: maven-local BuildRequires: ant >= 1.6 BuildRequires: jpackage-utils >= 1.5 BuildRequires: objectweb-asm @@ -86,6 +86,10 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG - 1:1.5.0-0.RC1.1.1 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Mon Dec 24 2012 Jochen Schmitt - 1:1.5.0-0.RC1.1 - Use -Dmaven.test.skip=1 to sip test run From d46f42ff659310f9da95114fcc8e61fdfcd63822 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 12:38:38 -0600 Subject: [PATCH 035/100] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- clojure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clojure.spec b/clojure.spec index 08dc045..1b3d25b 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,7 +6,7 @@ Name: clojure Epoch: 1 Version: 1.5.0 -Release: 0.RC1.1%{?dist}.1 +Release: 0.RC1.1%{?dist}.2 Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages @@ -86,6 +86,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1:1.5.0-0.RC1.1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Feb 06 2013 Java SIG - 1:1.5.0-0.RC1.1.1 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From e6f7365427fe043928347da9833e668a5fe35d6d Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sat, 2 Mar 2013 11:25:04 +0100 Subject: [PATCH 036/100] New upstream release --- .gitignore | 1 + clojure.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a2b5e4a..c11997e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz /clojure-1.5.0-RC1.zip /clojure-clojure-1.5.0-RC1.zip +/clojure-1.5.0.zip diff --git a/clojure.spec b/clojure.spec index 1b3d25b..8ecedb0 100644 --- a/clojure.spec +++ b/clojure.spec @@ -6,15 +6,13 @@ Name: clojure Epoch: 1 Version: 1.5.0 -Release: 0.RC1.1%{?dist}.2 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -# wget --content-disposition \ -# https://github.com/clojure/clojure/tarball/clojure-%{version} -Source0: %{archivename}-%{version}-RC1.zip +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip Source1: clojure.sh @@ -43,7 +41,7 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-%{version}-RC1 +%setup -q -n %{archivename}-%{version} %build ant -Dmaven.test.skip=1 @@ -86,6 +84,9 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Sat Mar 2 2013 Jochen Schmitt - 1:1.5.0-1 +- New upstream release + * Wed Feb 13 2013 Fedora Release Engineering - 1:1.5.0-0.RC1.1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index b9af1ee..c643b61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d73f49b100b7442362b405a964d56db clojure-clojure-1.5.0-RC1.zip +119cc712732d39edad2681279e72936d clojure-1.5.0.zip From bb5eb9c230fa031a680de893caaa73706cdb674e Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mon, 11 Mar 2013 16:21:08 +0100 Subject: [PATCH 037/100] New upstream release --- .gitignore | 1 + clojure.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c11997e..f871958 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clojure-1.5.0-RC1.zip /clojure-clojure-1.5.0-RC1.zip /clojure-1.5.0.zip +/clojure-1.5.1.zip diff --git a/clojure.spec b/clojure.spec index 8ecedb0..e118882 100644 --- a/clojure.spec +++ b/clojure.spec @@ -5,7 +5,7 @@ Name: clojure Epoch: 1 -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine diff --git a/sources b/sources index c643b61..a0c9c95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -119cc712732d39edad2681279e72936d clojure-1.5.0.zip +f46d49e5d26f776e2971473d70cf416f clojure-1.5.1.zip From 764e8e18a4108f8feb9fad6322f4d1f9da408a10 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 30 Apr 2013 17:04:24 +0200 Subject: [PATCH 038/100] 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 039/100] - 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 040/100] 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 041/100] =?UTF-8?q?Rel=C3=B6ease=20candidate=20of=20clojur?= =?UTF-8?q?e=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 042/100] 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 043/100] 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 044/100] 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 045/100] - 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 046/100] 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 047/100] 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 048/100] 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 049/100] 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 050/100] 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 051/100] 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 052/100] - 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 053/100] 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 054/100] 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 055/100] 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 056/100] - 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 057/100] - 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 058/100] - 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 059/100] - 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 060/100] - 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 061/100] 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 062/100] - 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 063/100] 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 064/100] - 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 065/100] 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 066/100] - 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 65992a0c28094964d659eefa6ffee09010402939 Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Sat, 4 Apr 2020 19:51:42 +0300 Subject: [PATCH 067/100] 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 068/100] 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 069/100] 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 070/100] 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 071/100] 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 072/100] 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 073/100] 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 074/100] - 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 075/100] 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 076/100] - 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 077/100] 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 078/100] 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 079/100] - 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 080/100] - 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 081/100] - 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 082/100] 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 80a400ddc34c1870bef37636b4fb3cbe19e6c2b6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 10 Feb 2022 14:52:58 -0800 Subject: [PATCH 083/100] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index e1c37d5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: clojure -# $Id$ -NAME := clojure -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 9848a4c0fca77d2dddd336a2cb944ff4d8becdbb Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Mon, 11 Apr 2022 12:51:29 +0300 Subject: [PATCH 084/100] 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 085/100] 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 086/100] 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 087/100] 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 088/100] 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 089/100] 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 090/100] 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 b147e6fc8bee6fdff659654f95f99f151a057def Mon Sep 17 00:00:00 2001 From: Markku Korkeala Date: Fri, 15 Mar 2024 14:23:20 +0200 Subject: [PATCH 091/100] 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 3183b10e77542e5f1096844fdcec14efe422d837 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:29:48 +0000 Subject: [PATCH 092/100] 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 093/100] 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 094/100] 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 095/100] 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 096/100] 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 097/100] 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 098/100] 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 099/100] 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 100/100] 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