From 37f680ec274c9b0b63e18c166bb7f13f71f62286 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 22 Sep 2011 18:57:59 +0200 Subject: [PATCH 1/9] New upstrem release Remove no-classpath patch (#684060) --- .gitignore | 2 ++ clojure-1.1.0-no_classpath.patch | 23 ----------------------- clojure.spec | 11 ++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 clojure-1.1.0-no_classpath.patch diff --git a/.gitignore b/.gitignore index 00900d4..20e7396 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ 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.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..ff0f0b4 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,18 +1,16 @@ Name: clojure Epoch: 1 -Version: 1.2.1 +Version: 1.3.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://github.com/downloads/clojure/clojure/clojure-%{version}.zip +Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}/clojure-%{version}.zip Source1: clojure.sh -Patch1: clojure-1.1.0-no_classpath.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -39,7 +37,6 @@ can avoid reflection. %prep %setup -q rm -f *.jar -%patch1 -p1 %build ant @@ -85,6 +82,10 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog +* Wed Sep 21 2011 Jochen Schmitt 1:1.3.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..f2e6ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5724c624fd6ce6a1d00252c27d53ebe clojure-1.2.1.zip +de91ee9914017a38c7cc391ab8fcbc1a clojure-1.3.0.zip From 984dc27a647f5a89f4ed70bcb924cd44688e3cc3 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 7 Jun 2012 17:20:51 +0700 Subject: [PATCH 2/9] Revert "New upstrem release" so we can cherry-pick changes from F17 more easily This reverts commit 37f680ec274c9b0b63e18c166bb7f13f71f62286. --- .gitignore | 2 -- clojure-1.1.0-no_classpath.patch | 23 +++++++++++++++++++++++ clojure.spec | 11 +++++------ sources | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 clojure-1.1.0-no_classpath.patch diff --git a/.gitignore b/.gitignore index 20e7396..00900d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ 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.1.0-no_classpath.patch b/clojure-1.1.0-no_classpath.patch new file mode 100644 index 0000000..34e4ac0 --- /dev/null +++ b/clojure-1.1.0-no_classpath.patch @@ -0,0 +1,23 @@ +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 ff0f0b4..ba7d8c7 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,16 +1,18 @@ Name: clojure Epoch: 1 -Version: 1.3.0 +Version: 1.2.1 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://repo1.maven.org/maven2/org/clojure/clojure/%{version}/clojure-%{version}.zip +Source0: http://github.com/downloads/clojure/clojure/clojure-%{version}.zip Source1: clojure.sh +Patch1: clojure-1.1.0-no_classpath.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +39,7 @@ can avoid reflection. %prep %setup -q rm -f *.jar +%patch1 -p1 %build ant @@ -82,10 +85,6 @@ rm -rf %{buildroot} %{_mavendepmapfragdir}/* %changelog -* Wed Sep 21 2011 Jochen Schmitt 1:1.3.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 f2e6ee5..adc2a96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de91ee9914017a38c7cc391ab8fcbc1a clojure-1.3.0.zip +c5724c624fd6ce6a1d00252c27d53ebe clojure-1.2.1.zip From 4afad222fad39eeed7baf804932ce44fb0ef197a Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 21 Sep 2011 17:35:53 +0200 Subject: [PATCH 3/9] 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 032735fc42451acdb66e5568463aa7cc85f08fdc Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 22 Sep 2011 18:57:59 +0200 Subject: [PATCH 4/9] 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 77ce18e5cbec236e45b88ef88f76b4056caed804 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 25 Sep 2011 20:00:05 +0200 Subject: [PATCH 5/9] 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 e02fb4d6a57667004ae2d46266d98cd740080c0a Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 17 Apr 2012 22:09:23 +0200 Subject: [PATCH 6/9] 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 b255c79724fe12d39708449bf5b827f28ea70200 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 7 Jun 2012 16:50:52 +0700 Subject: [PATCH 7/9] 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 df2a3bf..f3dcbe2 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 167311847d40489cbe7399b8d3acdf70d45e7455 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 7 Jun 2012 17:04:18 +0700 Subject: [PATCH 8/9] 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 f3dcbe2..ab54e80 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 eb3abb8c3f2291b1731e752eb8ee6270e1f9132b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 8 Jun 2012 00:51:37 +0700 Subject: [PATCH 9/9] 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 ab54e80..f0b9c6d 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}