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

David Walluck david at ryu.zarb.org
Tue Dec 21 17:23:01 CET 2010


Update of /home/projects/jpackage/cvs/dist/jline2/devel
In directory ryu.zarb.org:/tmp/cvs-serv10740/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jline2-jpp-depmap.xml jline2-pom.patch jline2-settings.xml 
	jline2.spec 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jline2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	21 Dec 2010 16:21:01 -0000	1.1
--- .cvsignore	21 Dec 2010 16:22:59 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jline2-2.5.tar.bz2

--- NEW FILE: jline2-pom.patch ---
--- pom.xml.orig	2010-12-21 11:04:33.321614328 -0500
+++ pom.xml	2010-12-21 11:04:49.002998622 -0500
@@ -193,11 +193,11 @@
                 </executions>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-plugin</artifactId>
                 <version>1.4</version>
-            </plugin>
+            </plugin>-->
 
             <!-- include all the dependencies into the jar so it can run standalone -->
             <plugin>
@@ -270,4 +270,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: jline2-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/jline2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	21 Dec 2010 16:21:01 -0000	1.1
--- sources	21 Dec 2010 16:22:59 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 908118fa9981d3512e42b4a618e3467c  jline2-2.5.tar.bz2

--- NEW FILE: jline2-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>
</dependencies>

--- NEW FILE: jline2.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:           jline2
Version:        2.5
Release:        1%{?dist}
Epoch:          0
Summary:        JLine
License:        ASL 2.0
URL:            http://jline2.fusesource.org
Group:          Development/Libraries/Java
# git clone git://github.com/jdillon/jline2.git && cd jline2 && git checkout jline2-2.5 && rm -rf .git && cd .. && mv jline2 jline2-2.5 && tar cjf jline2-2.5.tar.bz2 jline2-2.5
Source0:        jline2-2.5.tar.bz2
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Patch0:         jline2-pom.patch
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
Requires:       jpackage-utils
Requires:       jansi >= 0:1.4
BuildRequires:  apache-commons-parent
BuildRequires:  forge-parent >= 0:5
BuildRequires:  jansi >= 0:1.4
BuildRequires:  maven-surefire-provider-junit4
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
JLine.

%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/jline/jline/%{version}/jline-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
cp -p maven2-brew/org/sonatype/jline/jline/2.5/jline-2.5-tests.jar %{buildroot}%{_javadir}/%{name}-%{version}-tests.jar
(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/jline/jline/%{version}/jline-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.sonatype.jline jline %{version} JPP %{name}

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/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/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 LICENSE.txt README.md
%{_javadir}*/%{name}-%{version}.jar
%{_javadir}*/%{name}.jar
%{_javadir}*/%{name}-%{version}-tests.jar
%{_javadir}*/%{name}-tests.jar
%{_datadir}/maven2/poms/JPP-%{name}.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:2.5-1
- release




More information about the JPackage-commits mailing list