rpms/piccolo/devel piccolo-build_xml.patch, NONE, 1.1 piccolo.spec, 1.1, 1.2
Matt Wringe (mwringe)
fedora-extras-commits at redhat.com
Mon Mar 12 21:13:48 UTC 2007
Author: mwringe
Update of /cvs/extras/rpms/piccolo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5196
Modified Files:
piccolo.spec
Added Files:
piccolo-build_xml.patch
Log Message:
* Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> - 0:1.04-2jpp.2
- Add piccolo-build_xml.patch to allow building on newer jvms.
piccolo-build_xml.patch:
--- NEW FILE piccolo-build_xml.patch ---
--- build.xml.orig 2007-03-12 16:09:08.000000000 -0400
+++ build.xml 2007-03-12 16:09:24.000000000 -0400
@@ -112,7 +112,7 @@
<mkdir dir="${build.classes}"/>
<!-- Compile the java code from ${src} into ${build} -->
- <javac debug="yes" optimize="on" target="1.2" srcdir="${src}" destdir="${build.classes}"/>
+ <javac debug="yes" optimize="on" srcdir="${src}" destdir="${build.classes}"/>
<!-- Replace the version tag in the manifest -->
<filter token="VERSION" value="${version}"/>
Index: piccolo.spec
===================================================================
RCS file: /cvs/extras/rpms/piccolo/devel/piccolo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piccolo.spec 12 Mar 2007 15:05:50 -0000 1.1
+++ piccolo.spec 12 Mar 2007 21:13:15 -0000 1.2
@@ -36,12 +36,13 @@
Summary: Small fast XML parser
Name: piccolo
Version: 1.04
-Release: 2jpp.1%{?dist}
+Release: 2jpp.2%{?dist}
Epoch: 0
License: Apache Software License
URL: http://piccolo.sourceforge.net/
Group: Text Processing/Markup/XML
Source0: piccolo-%{version}-src.zip
+Patch0: piccolo-build_xml.patch
BuildRequires: jpackage-utils >= 0:1.5.32
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit
@@ -77,6 +78,7 @@
cd ..
unzip -q %{SOURCE0}
cd %{name}-%{version}
+%patch0
#Fix wrong-file-end-of-line-encoding
sed -i 's/\r//g' LICENSE.txt
@@ -141,6 +143,9 @@
# -----------------------------------------------------------------------------
%changelog
+* Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> - 0:1.04-2jpp.2
+- Add piccolo-build_xml.patch to allow building on newer jvms.
+
* Tue Feb 13 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.04-2jpp.1%{?dist}
- Fixed release tag, buildroot, license and other rpmlint issues.
More information about the fedora-extras-commits
mailing list