rpms/geronimo-annotation/devel geronimo-annotation.spec, NONE, 1.1 import.log, NONE, 1.1 use_parent_pom.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

spike spike at fedoraproject.org
Tue Jul 27 03:38:27 UTC 2010


Author: spike

Update of /cvs/pkgs/rpms/geronimo-annotation/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geronimo-annotation.spec import.log use_parent_pom.patch 
Log Message:
Initial import



--- NEW FILE geronimo-annotation.spec ---
%global spec_ver 1.1
%global spec_name geronimo-annotation_%{spec_ver}_spec

Name:             geronimo-annotation
Version:          1.0
Release:          2%{?dist}
Summary:          Java EE: Annotation API v1.1
Group:            Development/Libraries
License:          ASL 2.0
URL:              http://geronimo.apache.org/

Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{version}/%{spec_name}-%{version}-source-release.tar.gz
Patch1:           use_parent_pom.patch
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:        noarch

BuildRequires:    java-devel >= 1:1.6.0
BuildRequires:    jpackage-utils
BuildRequires:    maven2 >= 2.2.1
BuildRequires:    geronimo-parent-poms
BuildRequires:    maven-resources-plugin

Requires:         java >= 1:1.6.0
Requires:         jpackage-utils
Requires(post):   jpackage-utils
Requires(postun): jpackage-utils

Provides:         annotation_api = %{spec_ver}

%description
This package defines the common annotations.

%package javadoc
Group:            Documentation
Summary:          Javadoc for %{name}
Requires:         jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{spec_name}-%{version}
sed -i 's/\r//' LICENSE 
%patch1 -p0

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/annotation.jar

# poms
install -d -m 0755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.geronimo.specs %{spec_name} %{version} JPP %{name}

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%doc LICENSE
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Mon Jul 26 2010 Chris Spike <chris.spike at arcor.de> 1.0-2
- Fixed whitespace/tabs use
- Fixed wrong EOL encoding

* Sun Jul 18 2010 Chris Spike <chris.spike at arcor.de> 1.0-1
- Initial version of the package


--- NEW FILE import.log ---
geronimo-annotation-1_0-2_fc14:HEAD:geronimo-annotation-1.0-2.fc14.src.rpm:1280201848

use_parent_pom.patch:
 pom.xml |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE use_parent_pom.patch ---
--- pom.xml	2010-04-22 13:37:14.000000000 +0200
+++ pom.xml	2010-07-16 15:04:09.915136587 +0200
@@ -28,3 +28,4 @@
-        <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java5-flava</artifactId>
-        <version>2.0</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>specs</artifactId>
+        <version>1.4</version>
+        <relativePath>../pom.xml</relativePath>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geronimo-annotation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Jul 2010 22:39:05 -0000	1.1
+++ .cvsignore	27 Jul 2010 03:38:27 -0000	1.2
@@ -0,0 +1 @@
+geronimo-annotation_1.1_spec-1.0-source-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geronimo-annotation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Jul 2010 22:39:05 -0000	1.1
+++ sources	27 Jul 2010 03:38:27 -0000	1.2
@@ -0,0 +1 @@
+fb56e13f2473fd7887557c2190c4b452  geronimo-annotation_1.1_spec-1.0-source-release.tar.gz



More information about the scm-commits mailing list