[Jpackage-commits] dist/maven2-skins/devel .cvsignore, 1.1, 1.2 maven2-skins-jpp-depmap.xml, NONE, 1.1 maven2-skins-poms.patch, NONE, 1.1 maven2-skins-settings.xml, NONE, 1.1 maven2-skins.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 21:06:48 CEST 2008


Update of /home/projects/jpackage/cvs/dist/maven2-skins/devel
In directory ryu.zarb.org:/tmp/cvs-serv763/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maven2-skins-jpp-depmap.xml maven2-skins-poms.patch 
	maven2-skins-settings.xml maven2-skins.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2-skins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:06:23 -0000	1.1
--- .cvsignore	28 May 2008 19:06:45 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ maven2-skins-3-r526741.tar.gz

--- NEW FILE: maven2-skins-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2-skins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:06:23 -0000	1.1
--- sources	28 May 2008 19:06:45 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 9075b97c786a4c2309ffa97f1da2a13c  maven2-skins-3-r526741.tar.gz

--- NEW FILE: maven2-skins-poms.patch ---
--- pom.xml.sav	2008-02-24 17:56:46.000000000 +0100
+++ pom.xml	2008-02-24 17:58:12.000000000 +0100
@@ -69,4 +69,3 @@
     </pluginManagement>
   </build>
 </project>
-
--- maven-application-skin/pom.xml.sav	2008-02-24 17:56:54.000000000 +0100
+++ maven-application-skin/pom.xml	2008-02-24 17:58:37.000000000 +0100
@@ -24,10 +24,11 @@
   <parent>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-skins</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>3</version>
   </parent>
   <artifactId>maven-application-skin</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
+  <packaging>jar</packaging>
   <name>Maven Application Skin</name>
   <description>Maven Application Skin</description>
 </project>
--- maven-classic-skin/pom.xml.sav	2008-02-24 17:56:36.000000000 +0100
+++ maven-classic-skin/pom.xml	2008-02-24 17:57:44.000000000 +0100
@@ -24,10 +24,11 @@
   <parent>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-skins</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>3</version>
   </parent>
   <artifactId>maven-classic-skin</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
+  <packaging>jar</packaging>
   <name>Maven Classic Skin</name>
   <description>Maven Classic Skin</description>
 </project>
--- maven-default-skin/pom.xml.sav	2008-02-24 17:57:09.000000000 +0100
+++ maven-default-skin/pom.xml	2008-02-24 17:59:26.000000000 +0100
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-skins</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>3</version>
   </parent>
   <artifactId>maven-default-skin</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
+  <packaging>jar</packaging>
   <name>Maven Default Skin</name>
   <description>Maven Default Skin</description>
 </project>
-
--- maven-stylus-skin/pom.xml.sav	2008-02-24 17:57:01.000000000 +0100
+++ maven-stylus-skin/pom.xml	2008-02-24 17:58:59.000000000 +0100
@@ -24,10 +24,11 @@
   <parent>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-skins</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>3</version>
   </parent>
   <artifactId>maven-stylus-skin</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
+  <packaging>jar</packaging>
   <name>Maven Site Skin</name>
   <description>Maven Site Skin</description>
 </project>

--- NEW FILE: maven2-skins.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section   free

%define maven_skins_version 3
%define default_skin_version 1.1
%define classic_skin_version 1.1
%define stylus_skin_version 1.1
%define application_skin_version 1.0

Name:           maven2-skins
Version:        %{maven_skins_version}
Release:        1jpp
Epoch:          0
Summary:        Maven Skins
License:        Apache Software License 2.0
Group:          Development/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
URL:            http://maven.apache.org/skins/
Source0:        maven2-skins-3-r526741.tar.gz
# svn export -r 526741 http://svn.apache.org/repos/asf/maven/skins/trunk/ maven2-skins-3-r526741
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml

Patch0:         maven2-skins-poms.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0

BuildRequires:  maven2-common-poms
BuildRequires:  maven2
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire

Requires:  java >= 0:1.5.0
Requires:  maven2

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

%description
The Maven Skins.

%package -n maven2-default-skin
Summary:        Maven Default Skin
Group:          Development/Libraries/Java
Version:        %{default_skin_version}
Requires:  %{name} = 0:%{maven_skins_version}-%{release}

%description -n maven2-default-skin
%{summary}.

%package -n maven2-classic-skin
Summary:        Maven Classic Skin
Group:          Development/Libraries/Java
Version:        %{classic_skin_version}
Requires:  %{name} = 0:%{maven_skins_version}-%{release}

%description -n maven2-classic-skin
%{summary}.

%package -n maven2-stylus-skin
Summary:        Maven Stylus Skin
Group:          Development/Libraries/Java
Version:        %{stylus_skin_version}
Requires:  %{name} = 0:%{maven_skins_version}-%{release}

%description -n maven2-stylus-skin
%{summary}.

%package -n maven2-application-skin
Summary:        Maven Application Skin
Group:          Development/Libraries/Java
Version:        %{application_skin_version}
Requires:  %{name} = 0:%{maven_skins_version}-%{release}

%description -n maven2-application-skin
%{summary}.


%prep
%setup -q -n %{name}-%{maven_skins_version}-r526741
cp %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
%patch0 -b .sav0

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
cp pom.xml $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.apache.maven.skins-maven-skins.pom

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export M2_SETTINGS=$(pwd)/settings.xml
mvn-jpp \
        -e \
        -s $M2_SETTINGS \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install

%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven2
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

%add_to_maven_depmap org.apache.maven.skins maven-skins %{maven_skins_version} JPP/maven2 maven-skins
install -m 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven2-maven-skins.pom

install -m 0644 maven-default-skin/target/maven-default-skin-%{default_skin_version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/maven2/default-skin-%{default_skin_version}.jar
install -m 0644 maven-default-skin/pom.xml \
        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2-default-skin.pom
%add_to_maven_depmap org.apache.maven.skins maven-default-skin %{default_skin_version} JPP/maven2 default-skin

install -m 0644 maven-classic-skin/target/maven-classic-skin-%{classic_skin_version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/maven2/classic-skin-%{classic_skin_version}.jar
install -m 0644 maven-classic-skin/pom.xml \
        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2-classic-skin.pom
%add_to_maven_depmap org.apache.maven.skins maven-classic-skin %{classic_skin_version} JPP/maven2 classic-skin

install -m 0644 maven-stylus-skin/target/maven-stylus-skin-%{stylus_skin_version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/maven2/stylus-skin-%{stylus_skin_version}.jar
install -m 0644 maven-stylus-skin/pom.xml \
        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2-stylus-skin.pom
%add_to_maven_depmap org.apache.maven.skins maven-stylus-skin %{stylus_skin_version} JPP/maven2 stylus-skin

install -m 0644 maven-application-skin/target/maven-application-skin-%{application_skin_version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/maven2/application-skin-%{application_skin_version}.jar
install -m 0644 maven-application-skin/pom.xml \
        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2-application-skin.pom
%add_to_maven_depmap org.apache.maven.skins maven-application-skin %{application_skin_version} JPP/maven2 application-skin

pushd $RPM_BUILD_ROOT%{_javadir}/maven2
   ln -fs default-skin-%{default_skin_version}.jar default-skin.jar
   ln -fs classic-skin-%{classic_skin_version}.jar classic-skin.jar
   ln -fs stylus-skin-%{stylus_skin_version}.jar stylus-skin.jar
   ln -fs application-skin-%{application_skin_version}.jar application-skin.jar
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files -n maven2-default-skin
%defattr(-,root,root,-)
%{_javadir}/maven2/default-skin*.jar

%files -n maven2-classic-skin
%defattr(-,root,root,-)
%{_javadir}/maven2/classic-skin*.jar

%files -n maven2-stylus-skin
%defattr(-,root,root,-)
%{_javadir}/maven2/stylus-skin*.jar

%files -n maven2-application-skin
%defattr(-,root,root,-)
%{_javadir}/maven2/application-skin*.jar

%changelog
* Mon Feb 25 2008 Ralph Apel <r.apel at r-apel.de> 0:3-1jpp
- First integral release


--- NEW FILE: maven2-skins-jpp-depmap.xml ---
<dependencies>
<!--
-->

</dependencies>




More information about the JPackage-commits mailing list