rpms/xpp2/devel xpp2-build_xml.patch, NONE, 1.1 xpp2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Nuno Santos (nsantos)
fedora-extras-commits at redhat.com
Mon Mar 12 16:25:27 UTC 2007
Author: nsantos
Update of /cvs/extras/rpms/xpp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12211/devel
Modified Files:
.cvsignore sources
Added Files:
xpp2-build_xml.patch xpp2.spec
Log Message:
auto-import xpp2-2.1.10-6jpp.1 on branch devel from xpp2-2.1.10-6jpp.1.src.rpm
xpp2-build_xml.patch:
--- NEW FILE xpp2-build_xml.patch ---
--- build.xml.sav 2003-11-15 06:42:11.000000000 +0100
+++ build.xml 2005-08-10 11:58:48.000000000 +0200
@@ -9,7 +9,8 @@
<property name="midp4palm.home" value="c:/util/midp4palm1.0" />
- <property name="target" value="1.1" />
+ <property name="target" value="1.4" />
+ <property name="source" value="1.4" />
<!-- set global properties for this build -->
<property name="name" value="XML Pull Parser"/>
@@ -165,7 +166,7 @@
<target name="intf" depends="prepare">
<mkdir dir="${build_intf}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
<touch file="${build_intf}/PullParser${version}_VERSION"/>
</target>
@@ -175,7 +176,7 @@
<target name="impl_tag" depends="intf">
<mkdir dir="${build_impl_tag}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
destdir="${build_impl_tag}"
classpath="${build_intf}">
@@ -185,7 +186,7 @@
<target name="impl_node" depends="intf">
<mkdir dir="${build_impl_node}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
destdir="${build_impl_node}"
classpath="${build_intf}:${build_impl_tag}">
@@ -195,7 +196,7 @@
<target name="impl_format" depends="intf">
<mkdir dir="${build_impl_format}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
destdir="${build_impl_format}"
classpath="${build_intf}">
@@ -205,7 +206,7 @@
<target name="impl_pp" depends="impl_tag,intf">
<mkdir dir="${build_impl_pp}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
destdir="${build_impl_pp}"
classpath="${build_intf}:${build_impl_tag}">
@@ -215,7 +216,7 @@
<target name="impl" depends="intf,impl_tag,impl_pp,impl_node,impl_format,drivers">
<mkdir dir="${build_impl_factory}/META-INF/services"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
destdir="${build_impl_factory}"
classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}:${build_impl_node}:${build_impl_format}">
<patternset refid="all.source.files"/>
@@ -247,7 +248,7 @@
<target name="impl_small" depends="intf,impl_tag,impl_pp">
<mkdir dir="${build_impl_small}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
destdir="${build_impl_small}"
classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}">
<patternset refid="all.source.files"/>
@@ -271,7 +272,7 @@
<target name="x2impl_pp" if="x2_present" depends="intf,check_x2">
<mkdir dir="${build_x2impl_pp}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
destdir="${build_x2impl_pp}"
classpath="${build_intf}">
</javac>
@@ -279,7 +280,7 @@
<target name="x2impl" if="x2_present" depends="x2impl_pp,drivers">
<mkdir dir="${build_x2impl_factory}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_x2impl_factory}"
destdir="${build_x2impl_factory}"
classpath="${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}">
@@ -304,7 +305,7 @@
<target name="samples" depends="intf">
<mkdir dir="${build_samples}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_samples}" destdir="${build_samples}"
classpath="${build_intf}"
>
@@ -319,7 +320,7 @@
<target name="api_sax2" depends="prepare">
<mkdir dir="${build_api_sax2}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_api_sax2}" destdir="${build_api_sax2}"
>
</javac>
@@ -327,7 +328,7 @@
<target name="driver_sax2" depends="api_sax2,intf">
<mkdir dir="${build_driver_sax2}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_driver_sax2}" destdir="${build_driver_sax2}"
classpath="${build_api_sax2}:${build_intf}"
>
@@ -336,7 +337,7 @@
<target name="api_jaxp11" depends="api_sax2">
<mkdir dir="${build_api_jaxp11}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}"
classpath="${build_api_sax2}"
>
@@ -350,7 +351,7 @@
<!--copy todir="${build_driver_jaxp11}/META-INF/services">
<fileset dir="${src_driver_jaxp11}/META-INF/services/"/>
</copy-->
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_driver_jaxp11}" destdir="${build_driver_jaxp11}"
classpath="${build_api_sax2}:${build_driver_sax2}:${build_api_jaxp11}:${build_intf}"
>
@@ -385,7 +386,7 @@
<delete dir="${build_j2me}/count_midlet" />
<mkdir dir="${build_j2me}/count_midlet"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_samples}" destdir="${build_j2me}/count_midlet"
bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
classpath="${build_intf}"
@@ -426,7 +427,7 @@
<!-- thi is special verion of XPP2 that is equivalent to impl_small but smaller -->
<target name="impl_tiny" depends="prepare">
<mkdir dir="${build_impl_tiny}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_impl_tiny}"
destdir="${build_impl_tiny}"
>
@@ -443,7 +444,7 @@
<delete dir="${build_j2me}/count_midlet_tiny" />
<mkdir dir="${build_j2me}/count_midlet_tiny"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_samples}" destdir="${build_j2me}/count_midlet_tiny"
bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
classpath="${build_impl_tiny}"
@@ -529,7 +530,7 @@
<target name="tests" if="junit.present" depends="intf,check_junit">
<mkdir dir="${build_tests}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_tests}" destdir="${build_tests}">
<classpath refid="test_classpath" />
</javac>
@@ -537,7 +538,7 @@
<target name="tiny_tests" if="junit.present" depends="impl_tiny,check_junit">
<mkdir dir="${build_tiny_tests}"/>
- <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
+ <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
srcdir="${src_tests}" destdir="${build_tiny_tests}" classpath="${build_impl_tiny}:${java.class.path}">
<patternset>
<exclude name="All**"/>
@@ -580,6 +581,7 @@
<javadoc packagenames="${apidoc_packages}"
sourcepath="${src_intf}"
destdir="${build_apidoc}"
+ source="1.4"
author="true"
version="true"
use="true"
@@ -596,6 +598,7 @@
<javadoc packagenames="${javadoc_packages}"
sourcepath="${src_intf}:${src_impl_factory}:${src_impl_small}:${src_impl_tag}:${src_impl_pp}:${src_impl_node}:${src_impl_format}:${src_x2impl}:${src_x2impl_factory}:${src_x2impl_pp}"
destdir="${build_javadoc}"
+ source="1.4"
author="true"
version="true"
use="true"
--- NEW FILE xpp2.spec ---
# Copyright (c) 2000-2007, 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 originalname PullParser
Summary: XML Pull Parser
Name: xpp2
Version: 2.1.10
Release: 6jpp.1%{?dist}
Epoch: 0
License: Apache Software License
URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/
Group: Text Processing/Markup/XML
Source0: http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
Patch0: xpp2-build_xml.patch
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: junit
BuildRequires: xml-commons-apis
Requires: xml-commons-apis
Requires: jpackage-utils
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
NOTE: XPP2 is no longer developed and is on maintenance mode.
All active development concentrates on its successor XPP3/MXP1.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
%description javadoc
%{summary}.
%package doc
Summary: Manual for %{name}
Group: Development/Documentation
%description doc
%{summary}.
%package demo
Summary: Samples for %{name}
Group: Development/Documentation
Requires: %{name} = %{epoch}:%{version}
%description demo
%{summary}.
%prep
%setup -q -n %{originalname}%{version}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%patch0 -b .sav
%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=$(build-classpath xml-commons-apis)
ant all api api.impl
CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
java AllTests
%install
rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/lib/%{originalname}-intf-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar
cp -p build/lib/%{originalname}-standard-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar
cp -p build/lib/%{originalname}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
cp -p build/lib/%{originalname}-x2-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf doc/{build.txt,api,api_impl}
# doc
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
# demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc README.html
%doc LICENSE.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-intf.jar
%{_javadir}/%{name}-intf-%{version}.jar
%{_javadir}/%{name}-standard.jar
%{_javadir}/%{name}-standard-%{version}.jar
%{_javadir}/%{name}-x2.jar
%{_javadir}/%{name}-x2-%{version}.jar
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%files doc
%defattr(0644,root,root,0755)
%doc %{_datadir}/doc/%{name}-%{version}
%doc %{_datadir}/doc/%{name}
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}-%{version}
%{_datadir}/%{name}
%changelog
* Tue Feb 13 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1.10-6jpp.1%{?dist}
- Fix release, license, buildroot, typo, and other rpmlint issues.
- Got rid of Vendor and Distribution.
- Rename manual subpackage to doc.
- Move README and LICENSE file back into main package, and mark all docs.
* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-6jpp
- First JPP-1.7 release
* Wed Aug 10 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-5jpp
- Fix Bug 17 installed but unpackaged symlinks
- Patch build.xml for source=1.4 and target=1.4
* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-4jpp
- Build with ant-1.6.2
- Relax some versioned dependencies
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.1.10-3jpp
- Upgrade to Ant 1.6.X
* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-2jpp
- Fix rpm var _originalname to originalname
- Include versionless symlinks for javadoc, manual and demo
- demo requires main package
* Thu Jan 15 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-1jpp
- First JPackage build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xpp2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Feb 2007 22:20:39 -0000 1.1
+++ .cvsignore 12 Mar 2007 16:24:55 -0000 1.2
@@ -0,0 +1 @@
+PullParser2.1.10.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xpp2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Feb 2007 22:20:39 -0000 1.1
+++ sources 12 Mar 2007 16:24:55 -0000 1.2
@@ -0,0 +1 @@
+865ca4e2496c215d301b57450137626f PullParser2.1.10.tgz
More information about the fedora-extras-commits
mailing list