[apache-commons-validator] Tweak source encoding to fix build with Java 1.7. Drop versioned jars and javadoc dir. Drop no longe
Ville Skyttä
scop at fedoraproject.org
Sat Jan 14 11:10:48 UTC 2012
commit 24ce8527ae5704e84a50e10c59599b9e804c9f3c
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sat Jan 14 13:10:41 2012 +0200
Tweak source encoding to fix build with Java 1.7.
Drop versioned jars and javadoc dir.
Drop no longer needed javadoc Obsoletes.
Crosslink with local JDK API docs.
apache-commons-validator.spec | 38 +++++++++++++++++++----------
commons-validator-1.3.1-crosslink.patch | 11 ++++++++
commons-validator-1.3.1-srcencoding.patch | 12 +++++++++
3 files changed, 48 insertions(+), 13 deletions(-)
---
diff --git a/apache-commons-validator.spec b/apache-commons-validator.spec
index a2671d1..8b2d60b 100644
--- a/apache-commons-validator.spec
+++ b/apache-commons-validator.spec
@@ -3,12 +3,15 @@
Name: apache-%{short_name}
Version: 1.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Apache Commons Validator
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0: commons-validator-1.3.1-crosslink.patch
+# https://issues.apache.org/jira/browse/VALIDATOR-303
+Patch1: commons-validator-1.3.1-srcencoding.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -29,7 +32,7 @@ Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-# This should go away with F-17
+# This should go away with F-17 after maven-shared-reporting-impl is fixed.
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:1.3.1-2
@@ -44,15 +47,16 @@ development and maintenance of validation rules.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: jpackage-utils
-# This should go away with F-17
-Obsoletes: jakarta-%{short_name}-javadoc < 0:1.3.1-2
+BuildRequires: java-javadoc
+Requires: java-javadoc
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
+%patch1 -p1
sed -i 's/\r//' LICENSE.txt
sed -i 's/\r//' RELEASE-NOTES.txt
sed -i 's/\r//' NOTICE.txt
@@ -86,30 +90,38 @@ rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -pm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}/
%clean
rm -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
+%{_javadir}/*%{short_name}.jar
%files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Sat Jan 14 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.3.1-7
+- Tweak source encoding to fix build with Java 1.7.
+- Drop versioned jars and javadoc dir.
+- Drop no longer needed javadoc Obsoletes.
+- Crosslink with local JDK API docs.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/commons-validator-1.3.1-crosslink.patch b/commons-validator-1.3.1-crosslink.patch
new file mode 100644
index 0000000..f893dd7
--- /dev/null
+++ b/commons-validator-1.3.1-crosslink.patch
@@ -0,0 +1,11 @@
+diff -up commons-validator-1.3.1-src/build.xml~ commons-validator-1.3.1-src/build.xml
+--- commons-validator-1.3.1-src/build.xml~ 2006-11-29 00:31:49.000000000 +0200
++++ commons-validator-1.3.1-src/build.xml 2012-01-14 13:00:24.844856452 +0200
+@@ -301,6 +301,7 @@
+ doctitle="<h1>${component.title} (Version ${component.version})</h1>"
+ windowtitle="${component.title} (Version ${component.version})"
+ bottom="Copyright (c) 2001-2004 Apache Software Foundation"
++ link="/usr/share/javadoc/java/"
+ classpathref="compile.classpath" />
+ </target>
+
diff --git a/commons-validator-1.3.1-srcencoding.patch b/commons-validator-1.3.1-srcencoding.patch
new file mode 100644
index 0000000..cad1242
--- /dev/null
+++ b/commons-validator-1.3.1-srcencoding.patch
@@ -0,0 +1,12 @@
+diff -up commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java~ commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java
+--- commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java~ 2006-11-29 00:31:49.000000000 +0200
++++ commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java 2012-01-14 12:40:40.709092267 +0200
+@@ -385,7 +385,7 @@ public class EmailTest extends TestCommo
+ new TestPair("abigail@", false),
+ new TestPair("@example.com", false),
+ new TestPair("phrase: abigail at example.com abigail at example.com ;", false),
+- new TestPair("invalid£char at example.com", false)
++ new TestPair("invalid\u00a3char at example.com", false)
+ };
+
+ /**
More information about the scm-commits
mailing list