From 9716461968224d04f2bedd298ab02c4dc0b10e8e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 4 Feb 2010 02:36:54 +0000 Subject: [PATCH 1/3] Initialize branch F-12 for apache-commons-exec --- 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 9fad876530f5110af498ece889c2d7e618fc86f4 Mon Sep 17 00:00:00 2001 From: melmorabity Date: Thu, 4 Feb 2010 03:12:06 +0000 Subject: [PATCH 2/3] First import --- .cvsignore | 1 + apache-commons-exec.spec | 114 +++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 117 insertions(+) create mode 100644 apache-commons-exec.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..bf66424 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +commons-exec-1.0.1-src.tar.gz diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec new file mode 100644 index 0000000..23baf72 --- /dev/null +++ b/apache-commons-exec.spec @@ -0,0 +1,114 @@ +%global base_name exec +%global short_name commons-%{base_name} + +Name: apache-commons-exec +Version: 1.0.1 +Release: 2%{?dist} +Summary: Java library to reliably execute external processes from within the JVM + +Group: Development/Libraries +License: ASL 2.0 +URL: http://commons.apache.org/exec/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-plugin-bundle +BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-assembly +BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-idea +BuildRequires: maven2-plugin-install +BuildRequires: maven2-plugin-jar +BuildRequires: maven2-plugin-javadoc +BuildRequires: maven2-plugin-resources +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun):jpackage-utils +BuildArch: noarch + +%description +Commons Exec is a library for dealing with external process execution and +environment management in Java. + + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + + +%prep +%setup -q -n %{short_name}-%{version}-src + +# Shell scripts used for unit tests must be executable (see +# http://commons.apache.org/exec/faq.html#environment-testing) +chmod a+x src/test/scripts/*.sh + + +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL +mvn-jpp \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc + + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} +ln -s %{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms +cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom + +%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +%update_maven_depmap + + +%postun +%update_maven_depmap + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt STATUS +%{_mavenpomdir}/* +%{_javadir}/*.jar +%{_mavendepmapfragdir}/* + + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name} + + +%changelog +* Wed Feb 3 2010 ELMORABITY Mohamed 1.0.1-2 +- Add missing %%post/%%postun Requires +- Use macro %%{_mavendepmapfragdir} instead of %%{_datadir}/maven2/pom +- Unown directories %%{_mavenpomdir} and %%{_mavendepmapfragdir} + +* Mon Jan 18 2010 ELMORABITY Mohamed 1.0.1-1 +- Initial RPM release diff --git a/import.log b/import.log new file mode 100644 index 0000000..f2822f7 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +apache-commons-exec-1_0_1-2_fc12:F-12:apache-commons-exec-1.0.1-2.fc12.src.rpm:1265253104 diff --git a/sources b/sources index e69de29..ec92ace 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b7e6651869f659345cb8e98d82747ba5 commons-exec-1.0.1-src.tar.gz From d1f48a4eed17163aacd692ef1eb5c5dee2ae6e02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:03:44 +0000 Subject: [PATCH 3/3] 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 3b6281b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apache-commons-exec -# $Id$ -NAME := apache-commons-exec -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 diff --git a/import.log b/import.log deleted file mode 100644 index f2822f7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -apache-commons-exec-1_0_1-2_fc12:F-12:apache-commons-exec-1.0.1-2.fc12.src.rpm:1265253104