From 9526457a398c3ae123bf2b379c597995001e1b27 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:10:54 -0500 Subject: [PATCH 1/9] - 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] - 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 7/9] - 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 8/9] 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 9/9] 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