Spec clean-up including having a direct dep to jpackage-utils

not rebuilding as this is not a significant enough update

.gitignore

@@ -1,28 +1 @@
 /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
-/clojure-1.5.1.zip
-/clojure-1.6.0-beta2.zip
-/clojure-1.6.0-RC1.zip
-/clojure-1.6.0-RC3.zip
-/clojure-1.6.0.zip
-/clojure-1.7.0-beta1.zip
-/clojure-1.7.0-beta2.zip
-/clojure-1.7.0-RC1.zip
-/clojure-1.7.0-RC2.zip
-/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

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 "$@"

clojure.spec

@@ -2,29 +2,33 @@
 %global groupId     org.clojure
 %global artifactId  clojure
 %global archivename %{project}-%{artifactId}
-%define add_determinism_options --handler=-jar
+%global commit_hash 0ba3ff1
 
 Name:           clojure
 Epoch:          1
-Version:        1.12.4
-Release:        1%{?dist}
+Version:        1.4.0
+Release:        2%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
-License:        EPL-1.0
+Group:          Development/Languages
+License:        EPL
 URL:            http://clojure.org/
-Source0:        https://github.com/%{name}/%{name}/archive/%{name}-%{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
 
 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:  ant >= 1.6
+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
 
 %description 
 Clojure is a dynamic programming language that targets the Java
@@ -39,233 +43,55 @@ 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}-8306949
 
 %build
-%mvn_build -f -j
+ant
 
 %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}
 
-%files -f .mfiles
-%license epl-v10.html 
-%doc changes.md readme.txt 
+%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
+%doc epl-v10.html changes.md readme.txt 
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
 %{_bindir}/%{name}
 
 %changelog
-* Thu Jan 15 2026 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.12.4-1
-- Update to upstream release 1.12.4, closes rhbz#2369851
-
-* Tue Dec 09 2025 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.12.3-2
-- Remove timestamp modifications from jar, closes to rhbz#2355949
-
-* Sun Nov 23 2025 Markku Korkeala <markku.korkeala@iki.fi> - 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 <jvanek@redhat.com> - 1:1.12.0-4
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Oct 11 2024 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.12.0-1
-- Update to upstream release 1.12.0, closes rhbz#2186974
-
-* Tue Oct 8 2024 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.11.3-1
-- Update to upstream release 1.11.3
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Mar 15 2024 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.11.2-1
-- Update to upstream release 1.11.2
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1:1.11.1-2
-- Rebuilt for Drop i686 JDKs
-
-* Sun Apr 10 2022 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.11.1-1
-- Update to upstream release 1.11.1
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:1.10.3-4
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Mar 06 2021 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.10.3-1
-- Update to upstream release 1.10.3
-
-* Sat Jan 30 2021 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.10.2-1
-- Update to upstream release 1.10.2
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 17 2021 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.10.1-6
-- Add javapackages-tools dependency to fix wrapper script.
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:1.10.1-4
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Sat May 02 2020 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.10.1-3
-- Use jpackage_script to generate clojure application shell script.
-
-* Fri May 01 2020 Fabio Valentini <decathorpe@gmail.com> - 1:1.10.1-2
-- Remove unnecessary maven-release-plugin and drop redundant Requires.
-
-* Wed Apr 15 2020 Markku Korkeala <markku.korkeala@iki.fi> - 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 <markku.korkeala@iki.fi> - 1:1.9.0-1
-- Update to upstream release 1.9.0, update clojure-spec-alpha dependency
-
-* Sat Apr 11 2020 Markku Korkeala <markku.korkeala@iki.fi> - 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 <markku.korkeala@iki.fi> - 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 <releng@fedoraproject.org> - 1:1.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Sep 04 2019 Markku Korkeala <markku.korkeala@iki.fi> - 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 <releng@fedoraproject.org> - 1:1.8.0-0.beta1.7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0-0.beta1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Oct 15 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.8.0-0.beta1
-- New prerelease of Clojure 1.8.0
-
-* Wed Jun 17 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.7.0-0.5
-- New upstream release (clojure-1.7.0-RC2)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.0-0.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jun  5 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.7.0-0.3
-- New upstream release
-
-* Fri May  1 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.7.0-0.2
-- New upstream release
-
-* Tue Apr 14 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.7.0-0.1
-- New upstream release
-
-* Thu Jul 24 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-3
-- Migrating to the new JAVA packaging guidelines
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 25 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-1
-- New upstream release
-
-* Mon Mar 24 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-0.5
-- New release candidate of clujure 1.6.0
-
-* Tue Mar 18 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-0.3
-- Relöease candidate of clojure 1.6.0
-
-* Wed Mar  5 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-0.2
-- New upstream pre-release
-- Add support for headless java (#1068005)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Apr 30 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.5.1-1
-- New upstream release.
-
-* Sat Mar  2 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.5.0-1
-- New upstream release
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.0-0.RC1.1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <Jochen herr-schmitt de> - 1:1.5.0-0.RC1.1
-- Use -Dmaven.test.skip=1 to sip test run
-
-* Sun Dec 23 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.5.0-0.RC1
-- New upstream release
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
 * Wed Jun  6 2012 Michel Salim <salimma@fedoraproject.org> - 1:1.4.0-2
 - Update to better follow packaging guidelines
 
 * Tue Apr 17 2012 Jochen Schmitt <Jochen herr-schmitt de> 1:1.4.0-1
 - New upstream release
 
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Sun Sep 25 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.3.0-1
 - New upstream release
 - Remove temp. patch to resolve JDK-1.7 issue

sources

@@ -1 +1 @@
-SHA512 (clojure-1.12.4.zip) = e1629a330426f694ec9da11957a17fce1504175a0e801402ddc053a695e7f95c0fdc1af746897c80a37f5d2084a571034027e869a683dfebfef92b7af3598320
+3a8430bc1005613dead40ff3a6dbd723  clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz