diff --git a/Makefile b/Makefile deleted file mode 100644 index ea87dd2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apache-resource-bundles -# $Id$ -NAME := apache-resource-bundles -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/apache-incubator-disclaimer-resource-bundle-1.1.pom b/apache-incubator-disclaimer-resource-bundle-1.1.pom deleted file mode 100644 index 2495577..0000000 --- a/apache-incubator-disclaimer-resource-bundle-1.1.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-incubator-disclaimer-resource-bundle - Apache Incubator Disclaimer Resource Bundle - 1.1 - 2006 - - An archive which contains the standard Apache Incubator disclaimer. - - diff --git a/apache-jar-resource-bundle-1.4.pom b/apache-jar-resource-bundle-1.4.pom deleted file mode 100644 index 0e32dae..0000000 --- a/apache-jar-resource-bundle-1.4.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-jar-resource-bundle - Apache JAR Resource Bundle - 1.4 - 2006 - - An archive which contains templates for generating the necessary license files and notices for all Apache releases. - - - - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - - diff --git a/apache-license-header-resource-bundle-1.1.pom b/apache-license-header-resource-bundle-1.1.pom deleted file mode 100644 index e595bac..0000000 --- a/apache-license-header-resource-bundle-1.1.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-license-header-resource-bundle - Apache License Header Resource Bundle - 1.1 - 2006 - - An archive which contains the notice file template. - - diff --git a/apache-resource-bundles-2.pom b/apache-resource-bundles-2.pom deleted file mode 100644 index 470cfc3..0000000 --- a/apache-resource-bundles-2.pom +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - org.apache.maven - maven-parent - 5 - ../pom/maven/pom.xml - - pom - org.apache - apache-resource-bundles - Apache Resource Bundles - 2 - 2006 - - apache-jar-resource-bundle - apache-license-header-resource-bundle - apache-incubator-disclaimer-resource-bundle - - - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - - - - - - maven-release-plugin - 2.0-beta-4 - - https://svn.apache.org/repos/asf/maven/resources/tags - - - - - - - - maven-remote-resources-plugin - - - - bundle - - - - - - - diff --git a/apache-resource-bundles-cleanup-poms.patch b/apache-resource-bundles-cleanup-poms.patch deleted file mode 100644 index 2bffc13..0000000 --- a/apache-resource-bundles-cleanup-poms.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- apache-resource-bundles-2/pom.xml.orig 2010-01-19 10:29:54.688919029 +0000 -+++ apache-resource-bundles-2/pom.xml 2010-01-19 10:30:08.671919266 +0000 -@@ -24,17 +24,6 @@ - https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - - -- -- -- -- maven-release-plugin -- 2.0-beta-4 -- -- https://svn.apache.org/repos/asf/maven/resources/tags -- -- -- -- - - - diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec deleted file mode 100644 index a315346..0000000 --- a/apache-resource-bundles.spec +++ /dev/null @@ -1,159 +0,0 @@ -%global jar_version 1.4 -%global lh_version 1.1 -%global id_version 1.1 - -Name: apache-resource-bundles -Version: 2 -Release: 3%{?dist} -Summary: Apache Resource Bundles - -Group: Development/Libraries -License: ASL 2.0 -URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/ -Source0: http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom -Source1: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar -Source2: http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom -Source3: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar -Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom -Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar -Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom - -# Remove maven-release plugin (not yet available on Fedora) -Patch0: apache-resource-bundles-cleanup-poms.patch - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: maven2 -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-remote-resources -BuildRequires: maven2-plugin-resources -BuildRequires: maven-surefire-maven-plugin - -# Requirements from the POMs -Requires: maven2-plugin-remote-resources - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - -BuildArch: noarch - -%description -An archive which contains templates for generating the necessary license files -and notices for all Apache releases. - -%prep -%setup -c -T -cp %SOURCE0 ./pom.xml -%patch0 -p1 - -# jar -mkdir -p apache-jar-resource-bundle -pushd apache-jar-resource-bundle -jar xvf %SOURCE1 -cp %SOURCE2 ./pom.xml -mkdir -p src/main/resources -mv META-INF src/main/resources -popd - -# license-header -mkdir -p apache-license-header-resource-bundle -pushd apache-license-header-resource-bundle -jar xvf %SOURCE3 -cp %SOURCE4 ./pom.xml -mkdir -p src/main/resources -mv META-INF src/main/resources -popd - -# incubator-disclaimer -mkdir -p apache-incubator-disclaimer-resource-bundle -pushd apache-incubator-disclaimer-resource-bundle -jar xvf %SOURCE5 -cp %SOURCE6 ./pom.xml -mkdir -p src/main/resources -mv META-INF src/main/resources -popd - - -%build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install - -%install -rm -rf $RPM_BUILD_ROOT - -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} - -# jar -# -pushd apache-jar-resource-bundle -install -m 644 \ - target/apache-jar-resource-bundle-%{jar_version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/jar-%{jar_version}.jar -cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-jar-resource-bundle.pom -%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP %{name}/jar -popd - -# license-header -pushd apache-license-header-resource-bundle -install -m 644 \ - target/apache-license-header-resource-bundle-%{lh_version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/license-header-%{lh_version}.jar -cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-license-header-resource-bundle.pom -%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP %{name}/license-header -popd - -# incubator-disclaimer -pushd apache-incubator-disclaimer-resource-bundle -install -m 644 \ - target/apache-incubator-disclaimer-resource-bundle-%{id_version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer-%{id_version}.jar -cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-incubator-disclaimer-resource-bundle.pom -%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP %{name}/incubator-disclaimer -popd - -# Unversioned jars -pushd $RPM_BUILD_ROOT%{_javadir}/%{name} -ln -sf jar-%{jar_version}.jar jar.jar -ln -sf license-header-%{lh_version}.jar license-header.jar -ln -sf incubator-disclaimer-%{id_version}.jar incubator-disclaimer.jar -popd - -# Add parent to depmap too -cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.apache %{name} %{version} JPP %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%files -%defattr(-,root,root,-) -%{_javadir}/%{name} -%config(noreplace) %{_mavendepmapfragdir}/* -%{_mavenpomdir}/*.pom - - - -%changelog -* Mon Feb 1 2010 Mary Ellen Foster 2-3 -- Fix license - -* Tue Jan 19 2010 Mary Ellen Foster 2-2 -- Add plugin dependencies from POMs -- Fix description -- Remove maven-release plugin (not on Fedora yet) - -* Mon Jan 18 2010 Mary Ellen Foster 2-1 -- Initial package 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/sources b/sources deleted file mode 100644 index 49e42a6..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -a45167b6e6ef6acc22d02592cd34b1aa apache-incubator-disclaimer-resource-bundle-1.1-sources.jar -489c1bbdc4b710bff7380342bccfacb1 apache-jar-resource-bundle-1.4-sources.jar -fd056a1ca286681e62ef91039f380433 apache-license-header-resource-bundle-1.1-sources.jar