[Jpackage-commits] dist/felix-osgi-compendium/devel .cvsignore, 1.1, 1.2 felix-osgi-compendium.demap, NONE, 1.1 felix-osgi-compendium.spec, NONE, 1.1 org.osgi.compendium-1.4.0~pom.xml.patch, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 23:49:33 CET 2010


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

Modified Files:
	.cvsignore sources 
Added Files:
	felix-osgi-compendium.demap felix-osgi-compendium.spec 
	org.osgi.compendium-1.4.0~pom.xml.patch 
Log Message:
- initial import

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

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-osgi-compendium/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	23 Dec 2010 22:48:49 -0000	1.1
--- sources	23 Dec 2010 22:49:30 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 8368b02c69bc5eed19717284265f1830  org.osgi.compendium-1.4.0-project.tar.gz

--- NEW FILE: felix-osgi-compendium.demap ---
<dependencies>
    <dependency>
      <maven>
        <groupId>org.apache.felix</groupId>
        <artifactId>org.osgi.core</artifactId>
        <version>1.4.0</version>
      </maven>
      <jpp>
        <groupId>JPP/felix</groupId>
        <artifactId>org.osgi.core</artifactId>
        <version>1.4.0</version>
      </jpp>
    </dependency>
    <dependency>
      <maven>
        <groupId>org.apache.felix</groupId>
        <artifactId>javax.servlet</artifactId>
        <version>1.0.0</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>tomcat6-servlet-2.5-api</artifactId>
        <version>6.0.26</version>
      </jpp>
    </dependency>
    <dependency>
      <maven>
        <groupId>org.apache.felix</groupId>
        <artifactId>org.osgi.foundation</artifactId>
        <version>1.2.0</version>
      </maven>
      <jpp>
        <groupId>JPP/felix</groupId>
        <artifactId>org.osgi.foundation</artifactId>
        <version>1.2.0</version>
      </jpp>
    </dependency>
</dependencies>

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

%global project felix
%global bundle org.osgi.compendium
%global groupId org.apache.felix
%global artifactId %{bundle}

Name:    %{project}-osgi-compendium
Version: 1.4.0
Release: 3%{?dist}
Summary: Felix OSGi R4 Compendium 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
Source1: %{name}.demap

# Remove <parent>
Patch0: %{bundle}-%{version}~pom.xml.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven2
BuildRequires:    maven2-plugin-compiler
BuildRequires:    maven2-plugin-install
BuildRequires:    maven2-plugin-jar
BuildRequires:    maven2-plugin-javadoc
BuildRequires:    maven-release-plugin
BuildRequires:    maven2-plugin-resources
BuildRequires:    maven2-plugin-surefire
BuildRequires:    maven-plugin-bundle
BuildRequires: felix-osgi-core
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: felix-osgi-foundation

Requires: felix-osgi-core
Requires: felix-osgi-foundation
Requires: java >= 1:1.6.0
Requires: tomcat6-servlet-2.5-api

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

%description
OSGi Service Platform Release 4 Compendium Interfaces and Classes.

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

%description javadoc
API documentation for %{name}.

%global POM %{_mavenpomdir}/JPP.%{project}-%{name}.pom

%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1 -b .sav

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
%__mkdir_p $MAVEN_REPO_LOCAL
mvn-jpp -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
        install javadoc:javadoc

%install
%__rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{project}
install -m 644 target/%{bundle}-%{version}.jar \
        %{buildroot}%{_javadir}/%{project}/%{bundle}-%{version}.jar

# versionless symlinks to jars
(cd %{buildroot}%{_javadir}/%{project} && for jar in *-%{version}*.jar; \
    do %__ln_s -f $jar `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP/%{project} %{bundle}

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

# 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}
%__rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%__rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/%{project}/*
%{POM}
%config(noreplace) %{_mavendepmapfragdir}/%{name}

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

%changelog
* Mon Jul 12 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.4.0-3
- Avoid owning the %%{_javadir}/%%{project} directory

* Wed Jul 07 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.4.0-2
- Use maven instead of ant

* Tue Jun 22 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.4.0-1
- Release 1.4.0

--- NEW FILE: org.osgi.compendium-1.4.0~pom.xml.patch ---
diff -Nur org.osgi.compendium-1.4.0/pom.xml org.osgi.compendium-1.4.0.new/pom.xml
--- org.osgi.compendium-1.4.0/pom.xml	2009-09-07 00:54:20.000000000 +0400
+++ org.osgi.compendium-1.4.0.new/pom.xml	2010-07-08 20:24:58.681894381 +0400
@@ -16,17 +16,13 @@
  specific language governing permissions and limitations
  under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix-parent</artifactId>
-    <version>1.2.0</version>
-    <relativePath>../pom/pom.xml</relativePath>  </parent>
   <organization>
     <name>OSGi Alliance</name>
     <url>http://www.osgi.org/</url>
   </organization>
   <modelVersion>4.0.0</modelVersion>
   <description>OSGi Service Platform Release 4 Compendium Interfaces and Classes.</description>
+  <groupId>org.apache.felix</groupId>
   <artifactId>org.osgi.compendium</artifactId>
   <version>1.4.0</version>
   <name>OSGi R4 Compendium Bundle</name>




More information about the JPackage-commits mailing list