From 4c54119f510c1e262d1f77f7891b447ad19187dd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:11:26 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for clojure --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 60255c67129dbd0f245e286820c52b546c80fe63 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:21 +0000 Subject: [PATCH 2/4] 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 9c55b4d05cc96caeb1c7064d496408b73ef5a8ec Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 9 Dec 2009 17:06:26 +0000 Subject: [PATCH 3/4] first stable upstream release --- clojure-1.0.0-no_classpath.patch | 18 ++++++++++++ clojure.spec | 48 ++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 58 insertions(+), 10 deletions(-) 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 @@ + + + +- + + + diff --git a/clojure.spec b/clojure.spec index e210973..0fdb9fb 100644 --- a/clojure.spec +++ b/clojure.spec @@ -1,13 +1,18 @@ + Name: clojure -Version: 20090320 -Release: 1%{?dist} +Epoch: 1 +Version: 1.0.0 +Release: 5%{?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 +37,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 @@ -57,20 +60,47 @@ 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 clojure/readme.txt +%doc readme.txt epl-v10.html %attr(0755,root,root) %{_bindir}/clojure %{_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 + +* 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 + +* 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 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 56a5a5017d16f737aa3c5bc8b1e69e6ca69ff463 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:50:04 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 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