[Jpackage-commits] dist/felix-parent/devel .cvsignore, 1.1, 1.2 felix-parent-1.2.1-pom.patch, NONE, 1.1 felix-parent-depmap.xml, NONE, 1.1 felix-parent.spec, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 19:19:25 CET 2010


Update of /home/projects/jpackage/cvs/dist/felix-parent/devel
In directory ryu.zarb.org:/tmp/cvs-serv31377/devel

Modified Files:
	.cvsignore sources 
Added Files:
	felix-parent-1.2.1-pom.patch felix-parent-depmap.xml 
	felix-parent.spec 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-parent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	23 Dec 2010 18:18:03 -0000	1.1
--- .cvsignore	23 Dec 2010 18:19:22 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ felix-parent-1.2.1.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix-parent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	23 Dec 2010 18:18:03 -0000	1.1
--- sources	23 Dec 2010 18:19:22 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ bf3aac86e62922b1f1454435e34e19ef  felix-parent-1.2.1.tar.bz2

--- NEW FILE: felix-parent-1.2.1-pom.patch ---
--- pom.xml.orig	2009-09-22 15:16:43.000000000 +0800
+++ pom.xml	2010-07-19 11:39:09.000000000 +0800
@@ -202,12 +202,6 @@
       <version>2.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.7</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <pluginManagement>

--- NEW FILE: felix-parent-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>org.easymock</groupId>
      		<artifactId>easymock</artifactId>
      		<version>2.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
      		<artifactId>easymock2</artifactId>
      		<version>2.5.2</version>
		</jpp>
	</dependency>
</dependencies>
--- NEW FILE: felix-parent.spec ---
Name:           felix-parent
Version:        1.2.1
Release:        2%{?dist}
Summary:        Parent POM file for Apache Felix Specs

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://felix.apache.org/
#svn export http://svn.apache.org/repos/asf/felix/releases/felix-parent-1.2.1/
#tar -jcf felix-parent-1.2.1.tar.bz2 felix-parent-1.2.1/
Source0:        %{name}-%{version}.tar.bz2
Source1:        %{name}-depmap.xml
#Remove mockito-all dependency which is not in koji
Patch0:        %{name}-%{version}-pom.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: jpackage-utils
BuildRequires: junit
BuildRequires: easymock2
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-deploy-plugin
BuildRequires: maven-gpg-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-project-info-reports-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-report-maven-plugin
BuildRequires: maven-plugin-build-helper

Requires: junit
Requires: easymock2
Requires: maven-plugin-plugin
Requires: maven-compiler-plugin
Requires: maven-install-plugin
Requires: maven-jar-plugin
Requires: maven-javadoc-plugin
Requires: maven-resources-plugin
Requires: maven-assembly-plugin
Requires: maven-source-plugin
Requires: maven-deploy-plugin
Requires: maven-gpg-plugin
Requires: maven-site-plugin
Requires: maven-project-info-reports-plugin
Requires: maven-release-plugin
Requires: maven-surefire-maven-plugin
Requires: maven-surefire-report-maven-plugin
Requires: maven-plugin-build-helper


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


%description
Parent POM file for Apache Felix Specs.

%prep
%setup -q #You may need to update this according to your Source0
%patch0 -p0

%build
#mvn-jpp call is not really needed for the pom file. 
#But it's good to have it there to see changes in dependencies when new version is released
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

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

# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
    %{buildroot}%{_mavenpomdir}/JPP.felix-%{name}.pom

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
rm -rf %{buildroot}

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


%changelog
* Tue Jul 20 2010 Hui Wang <huwang at redhat.com> - 1.2.1-2
- Update summary and description
- Add comment in mvn-jpp

* Fri Jul 16 2010 Hui Wang <huwang at redhat.com> - 1.2.1-1
- Initial version of the package



More information about the JPackage-commits mailing list