diff --git a/.gitignore b/.gitignore index 51ac2f2..fba5c80 100644 --- a/.gitignore +++ b/.gitignore @@ -14,15 +14,3 @@ /clojure-1.7.0.zip /clojure-1.8.0-beta1.zip /clojure-1.8.0.zip -/clojure-1.9.0-alpha15.zip -/clojure-1.9.0-beta3.zip -/clojure-1.9.0.zip -/clojure-1.10.1.zip -/clojure-1.10.2.zip -/clojure-1.10.3.zip -/clojure-1.11.1.zip -/clojure-1.11.2.zip -/clojure-1.11.3.zip -/clojure-1.12.0.zip -/clojure-1.12.3.zip -/clojure-1.12.4.zip diff --git a/clojure.sh b/clojure.sh index 74a7106..4ef2bc6 100644 --- a/clojure.sh +++ b/clojure.sh @@ -1,6 +1,2 @@ #!/bin/bash -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 "$@" +exec java ${JAVA_OPTS} -jar /usr/share/java/clojure.jar "$@" diff --git a/clojure.spec b/clojure.spec index 550b009..494c643 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,29 +2,36 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%define add_determinism_options --handler=-jar +%global full_version %{version} Name: clojure Epoch: 1 -Version: 1.12.4 +Version: 1.8.0 Release: 1%{?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 +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip + +Source1: clojure.sh BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -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) -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 +BuildRequires: javapackages-tools +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 +%else +Requires: java >= 1:1.6 +%endif + +Requires: objectweb-asm %description Clojure is a dynamic programming language that targets the Java @@ -39,136 +46,34 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-%{version} - -%pom_remove_plugin :maven-release-plugin -%pom_remove_plugin :central-publishing-maven-plugin -%pom_remove_plugin :maven-javadoc-plugin - +%setup -q -n %{archivename}-%{full_version} %build -%mvn_build -f -j +ant -Dmaven.test.skip=1 + +%mvn_artifact pom.xml %{name}.jar %install - -%mvn_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 -%jpackage_script clojure.main "" "" clojure:clojure-spec-alpha:clojure-core-specs-alpha clojure false +install -d -m 755 %{buildroot}%{_bindir} +install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} + +%mvn_install %files -f .mfiles %license epl-v10.html %doc changes.md readme.txt +%{_mavenpomdir}/* +%{_javadir}/%{name}.jar %{_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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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. - -* 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 - -* 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. - -* 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 - -* 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 - -* 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 diff --git a/sources b/sources index 4a227e6..f59d194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.12.4.zip) = e1629a330426f694ec9da11957a17fce1504175a0e801402ddc053a695e7f95c0fdc1af746897c80a37f5d2084a571034027e869a683dfebfef92b7af3598320 +SHA512 (clojure-1.8.0.zip) = 36d95213f35ba182d8f3efb4753a50078a0f19a4ef9084c10c300ea075d11ba7d92dec51347afc5c23424800b9c75f9fcc363b23ead4f836ed193d8913ade0e4