From b68d75985edc3b67b485ca53e17b23f765f9c6d6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 11 Feb 2010 06:26:25 +0000 Subject: [PATCH 1/3] Initialize branch F-12 for aduna-commons-pom --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From e8589b06eb3c7029f78605a54518d5b92ee47f78 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 11 Feb 2010 09:46:16 +0000 Subject: [PATCH 2/3] Import to F12 --- aduna-commons-16.pom | 154 +++++++++++++++++++++++++++++++++++++++++ aduna-commons-pom.spec | 66 ++++++++++++++++++ 2 files changed, 220 insertions(+) create mode 100644 aduna-commons-16.pom create mode 100644 aduna-commons-pom.spec diff --git a/aduna-commons-16.pom b/aduna-commons-16.pom new file mode 100644 index 0000000..0f460ff --- /dev/null +++ b/aduna-commons-16.pom @@ -0,0 +1,154 @@ + + + 4.0.0 + + + info.aduna + aduna-root-pom + 13 + ../pom.xml + + + info.aduna.commons + aduna-commons + pom + 16 + + Aduna Commons + Aduna Commons parent pom + + + Aduna + http://www.aduna-software.com/ + + + + + Aduna BSD license + http://repo.aduna-software.org/legal/aduna-bsd.txt + repo + A BSD-style OSS license + + + + + collections/trunk + concurrent/trunk + graphics/trunk + i18n/trunk + io/trunk + iteration/trunk + lang/trunk + language/trunk + net/trunk + net-http-server-embedded/trunk + platform/trunk + scheduling/trunk + swing/trunk + text/trunk + webapp/trunk + xml/trunk + + + + UTF-8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + org.apache.felix + maven-bundle-plugin + + repository.xml + + + + bundle-manifest + process-classes + + manifest + + + + bundle-package + package + + bundle + + + + bundle-install + install + + install + + + + bundle-deploy + deploy + + deploy + + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 1.5 + true + utf8 + + http://java.sun.com/j2se/1.5.0/docs/api/ + + + + + + + + + + + true + + + false + + aduna-opensource.releases + Aduna Open Source - Maven releases + http://repo.aduna-software.org/maven2/releases + + + + + scm:svn:http://repo.aduna-software.org/svn/info.aduna/commons/ + scm:svn:https://repo.aduna-software.org/svn/info.aduna/commons/ + http://repo.aduna-software.org/websvn/listing.php?repname=aduna&path=/info.aduna/commons/ + + + diff --git a/aduna-commons-pom.spec b/aduna-commons-pom.spec new file mode 100644 index 0000000..4e26517 --- /dev/null +++ b/aduna-commons-pom.spec @@ -0,0 +1,66 @@ +Name: aduna-commons-pom +Version: 16 +Release: 1%{?dist} +Summary: Aduna Commons parent pom + +Group: Development/Libraries +License: BSD +URL: http://www.aduna-software.com/ +Source0: http://repo.aduna-software.org/maven2/releases/info/aduna/commons/aduna-commons/%{version}/aduna-commons-%{version}.pom +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires: aduna-root-poms + +BuildRequires: jpackage-utils >= 0:1.7.5 +Requires: jpackage-utils >= 0:1.7.5 +Requires(post): jpackage-utils >= 0:1.7.5 +Requires(postun): jpackage-utils >= 0:1.7.5 + +# Requirements from the POM +Requires: maven2-plugin-compiler +Requires: maven-plugin-bundle +Requires: maven2-plugin-javadoc + +BuildArch: noarch + +%description +%{summary}. + +%prep +%setup -c -T +cp %SOURCE0 . + +%build +# Nothing to do ... + +%install +rm -rf $RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -pm 644 aduna-commons-%{version}.pom \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-aduna-commons.pom + +%add_to_maven_depmap info.aduna.commons aduna-commons %{version} JPP aduna-commons + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_mavendepmapfragdir}/* +%{_datadir}/maven2/poms/*.pom + +%changelog +* Wed Feb 3 2010 Mary Ellen Foster 16-1 +- Update to new upstream version with license information included +- Add all plugins from the POM as Requirements +- Fix URL + +* Fri Nov 20 2009 Mary Ellen Foster 14-1 +- Initial package From 210b838e3c99a005283e4fc0e70e3c3426f36d95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:36:50 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 cb2afa0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aduna-commons-pom -# $Id$ -NAME := aduna-commons-pom -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12