[Jpackage-commits] dist/felix-osgi-foundation/devel .cvsignore, 1.1, 1.2 felix-osgi-foundation.spec, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 23:50:46 CET 2010


Update of /home/projects/jpackage/cvs/dist/felix-osgi-foundation/devel
In directory ryu.zarb.org:/tmp/cvs-serv17675/devel

Modified Files:
	.cvsignore sources 
Added Files:
	felix-osgi-foundation.spec 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-osgi-foundation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	23 Dec 2010 22:50:15 -0000	1.1
--- .cvsignore	23 Dec 2010 22:50:43 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ org.osgi.foundation-1.2.0-project.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-osgi-foundation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	23 Dec 2010 22:50:15 -0000	1.1
--- sources	23 Dec 2010 22:50:43 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ f9eceb4653a3135b4cf3e2b99606eb5f  org.osgi.foundation-1.2.0-project.tar.gz

--- NEW FILE: felix-osgi-foundation.spec ---
# Prevent brp-java-repack-jars from being run.
%define __jar_repack %{nil}

%global bundle org.osgi.foundation
%global felixdir %{_javadir}/felix

Name:    felix-osgi-foundation
Version: 1.2.0
Release: 4%{?dist}
Summary: Felix OSGi Foundation EE Bundle

Group:   Development/Libraries
License: ASL 2.0
URL:     http://felix.apache.org
Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz

BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven2
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven-doxia-sitetools

Requires: java >= 1:1.6.0

Requires(post):   jpackage-utils
Requires(postun): jpackage-utils

%description
OSGi Foundation Execution Environment (EE) Classes.

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

%description javadoc
API documentation for %{name}.

%global publicPOM %{_mavenpomdir}/JPP.felix-%{bundle}.pom

%prep
%setup -q -n %{bundle}-%{version}

%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
# jars
install -d -m 0755 %{buildroot}%{felixdir}
install -m 644 target/%{bundle}-%{version}.jar \
        %{buildroot}%{felixdir}/%{bundle}.jar

%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}

# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{publicPOM}

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :

%files
%defattr(-,root,root,-)
%doc LICENSE
%{felixdir}
%{publicPOM}
%config(noreplace) %{_mavendepmapfragdir}/%{name}

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

%changelog
* Mon Dec 13 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.2.0-4
- Versionless jars & javadocs
- Fix pom filename (#655800)

* Wed Jun 30 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.2.0-3
- The javadoc subpackage should have requires on jpackage-utils
- Use the mavenpomdir macro
- Rename the mavenPOM macro to publicPOM

* Tue Jun 29 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.2.0-2
- Use maven to build the project instead of ant

* Thu Jun 24 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.2.0-1
- Release 1.2.0




More information about the JPackage-commits mailing list