[maven-jflex-plugin] Fix javadoc source encoding.

Ville Skyttä scop at fedoraproject.org
Thu Jan 19 10:31:28 UTC 2012


commit 32f360f009425f75b6b4040c2925c6e0d15ef33b
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jan 19 12:31:20 2012 +0200

    Fix javadoc source encoding.

 maven-jflex-plugin-1.4.3-srcencoding.patch |   40 ++++++++++++++++++++++++++++
 maven-jflex-plugin.spec                    |    8 +++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/maven-jflex-plugin-1.4.3-srcencoding.patch b/maven-jflex-plugin-1.4.3-srcencoding.patch
new file mode 100644
index 0000000..0158c4e
--- /dev/null
+++ b/maven-jflex-plugin-1.4.3-srcencoding.patch
@@ -0,0 +1,40 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 606)
++++ pom.xml	(working copy)
+@@ -76,6 +76,9 @@
+ 			<distribution>repo</distribution>
+ 		</license>
+ 	</licenses>
++	<properties>
++		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
++	</properties>
+ 	<build>
+ 		<plugins>
+ 			<plugin>
+@@ -83,7 +86,6 @@
+ 				<configuration>
+ 					<source>1.5</source>
+ 					<target>1.5</target>
+-					<encoding>UTF-8</encoding>
+ 				</configuration>
+ 			</plugin>
+ 		</plugins>
+@@ -151,7 +153,6 @@
+ 					</rulesets>
+ 					<format>xml</format>
+ 					<linkXref>true</linkXref>
+-					<sourceEncoding>utf-8</sourceEncoding>
+ 					<minimumTokens>100</minimumTokens>
+ 				</configuration>
+ 			</plugin>
+@@ -179,9 +180,6 @@
+ 			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-javadoc-plugin</artifactId>
+-				<configuration>
+-					<encoding>ISO-8859-1</encoding>
+-				</configuration>
+ 			</plugin>
+ 			<plugin>
+ 				<groupId>org.codehaus.mojo</groupId>
diff --git a/maven-jflex-plugin.spec b/maven-jflex-plugin.spec
index 231a71c..80feaa9 100644
--- a/maven-jflex-plugin.spec
+++ b/maven-jflex-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-jflex-plugin
 Version:        1.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven JFlex Plugin
 
 Group:          Development/Libraries
@@ -10,6 +10,8 @@ URL:            http://jflex.sourceforge.net/maven-jflex-plugin/
 # svn export http://jflex.svn.sourceforge.net/svnroot/jflex/tags/release_1_4_3/maven-jflex-plugin maven-jflex-plugin-1.4.3
 # tar cjf maven-jflex-plugin-1.4.3.tar.bz2 maven-jflex-plugin-1.4.3/
 Source0:        maven-jflex-plugin-1.4.3.tar.bz2
+# http://sf.net/tracker/?func=detail&aid=3475986&group_id=14929&atid=314929
+Patch0:         maven-jflex-plugin-1.4.3-srcencoding.patch
 
 BuildArch: noarch
 
@@ -46,6 +48,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
+%patch0 -p0
 
 %build
 mvn-rpmbuild \
@@ -82,6 +85,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 19 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-7
+- Fix javadoc source encoding.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list