[Jpackage-commits] rpms/free/gossip gossip-jpp-depmap.xml, NONE, 1.1 gossip-pom.patch, NONE, 1.1 gossip-settings.xml, NONE, 1.1 gossip.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Tue Dec 21 10:52:14 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/gossip
In directory ryu.zarb.org:/tmp/eyagq0rh8r/rpms/free/gossip

Added Files:
	gossip-jpp-depmap.xml gossip-pom.patch gossip-settings.xml 
	gossip.spec 
Log Message:
1.5-1.jpp6

--- NEW FILE: gossip-pom.patch ---
--- pom.xml.sav0	2010-12-21 02:04:37.000000000 -0500
+++ pom.xml	2010-12-21 02:07:05.919153128 -0500
@@ -229,7 +229,7 @@
                 </configuration>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
                 <version>1.2</version>
@@ -246,7 +246,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
 
             <!--<plugin>-->
                 <!--<groupId>org.apache.maven.plugins</groupId>-->
@@ -271,12 +271,12 @@
                 </configuration>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-plugin</artifactId>
                 <version>1.3</version>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
     
-</project>
\ No newline at end of file
+</project>
--- gossip-core/pom.xml.sav0	2010-12-21 02:04:37.000000000 -0500
+++ gossip-core/pom.xml	2010-12-21 02:11:03.275960848 -0500
@@ -31,6 +31,12 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -47,12 +53,12 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.sonatype.jline</groupId>
             <artifactId>jline</artifactId>
             <version>2.3</version>
             <optional>true</optional>
-        </dependency>
+        </dependency>-->
     </dependencies>
     
     <build>
@@ -97,4 +103,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: gossip-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.5-20081211</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>servlet_2_5_api</artifactId>
         <version>2.5</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>com.thoughtworks.qdox</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.3</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>qdox</artifactId>
         <version>1.12</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>asm</groupId>
         <artifactId>asm-commons</artifactId>
         <version>3.2</version>
      </maven>
      <jpp>
         <groupId>JPP/objectweb-asm</groupId>
         <artifactId>asm-commons</artifactId>
         <version>3.2</version>
      </jpp>
   </dependency>
</dependencies>

--- NEW FILE: gossip-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>

--- NEW FILE: gossip.spec ---
# Copyright (c) 2000-2010, 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 with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

%bcond_with gcj_support
%bcond_without repolib

%if %with gcj_support
%define gcj_support 1
%else
%define gcj_support 0
%endif

%define section free

Name:           gossip
Version:        1.5
Release:        1%{?dist}
Epoch:          0
Summary:        Gossip
License:        ASL 2.0
URL:            http://gossip.fusesource.org
Group:          Development/Libraries/Java
# git clone git://github.com/jdillon/gossip.git && cd gossip && git checkout gossip-1.5 && rm -rf .git && cd .. && mv gossip gossip-1.5 && tar cjf gossip-1.5.tar.bz2 gossip-1.5
Source0:        gossip-1.5.tar.bz2
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Patch0:         gossip-pom.patch
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
Requires:       jansi >= 0:1.4
Requires:       jpackage-utils
BuildRequires:  apache-commons-parent
# FIXME: this is for forge-parent
BuildRequires:  plexus-build-api
BuildRequires:  jansi >= 0:1.4
BuildRequires:  maven-surefire-provider-junit4
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
Gossip is a plugin for SLF4j which has simple and flexible configuration.

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

%description javadoc
%{summary}.

%if 0
%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.
%endif

%if %with repolib
%package repolib
Summary:        Artifacts to be uploaded to a repository library
Group:          Development/Libraries/Java

%description repolib
Artifacts to be uploaded to a repository library.
This package is not meant to be installed but so its contents
can be extracted through rpm2cpio.
%endif

%prep
%setup -q
%patch0 -p0 -b .sav0

%build
%{_bindir}/mvn-jpp \
        -e \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
        -Dmaven.test.skip=true \
        deploy \
        javadoc:aggregate \
%if 0
        site
%endif

find $(pwd)/maven2-brew

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_javadir}
cp -p maven2-brew/org/sonatype/gossip/gossip-core/%{version}/gossip-core-%{version}.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/sonatype/gossip/gossip-slf4j/%{version}/gossip-slf4j-%{version}.jar %{buildroot}%{_javadir}/
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)

mkdir -p %{buildroot}%{_datadir}/maven2/poms
cp -p maven2-brew/org/sonatype/gossip/gossip/%{version}/gossip-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gossip.pom
cp -p maven2-brew/org/sonatype/gossip/gossip-core/%{version}/gossip-core-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gossip-core.pom
cp -p maven2-brew/org/sonatype/gossip/gossip-slf4j/%{version}/gossip-slf4j-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gossip-slf4j.pom

%add_to_maven_depmap org.sonatype.gossip gossip %{version} JPP gossip
%add_to_maven_depmap org.sonatype.gossip gossip-core %{version} JPP gossip-core
%add_to_maven_depmap org.sonatype.gossip gossip-slf4j %{version} JPP gossip-slf4j

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%if 0
# manual
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
cp -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
rm -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
%endif

%if %with repolib
%{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
%{__cp} -pr maven2-brew/* %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
%endif

%clean
rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc README.md
%{_javadir}*/gossip-core-%{version}.jar
%{_javadir}*/gossip-core.jar
%{_javadir}*/gossip-slf4j-%{version}.jar
%{_javadir}*/gossip-slf4j.jar
%{_datadir}/maven2/poms/JPP-gossip.pom
%{_datadir}/maven2/poms/JPP-gossip-core.pom
%{_datadir}/maven2/poms/JPP-gossip-slf4j.pom
%{_mavendepmapfragdir}/%{name}

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

%if 0
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}
%endif

%if %with repolib
%files repolib
%defattr(0644,root,root,0755)
%dir %{_javadir}*/
%{_javadir}*/repository.jboss.com
%endif

%changelog
* Tue Dec 21 2010 David Walluck <dwalluck at redhat.com> 0:1.5-1
- release




More information about the JPackage-commits mailing list