rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.14,1.15

Lillian Angel (langel) fedora-extras-commits at redhat.com
Thu Mar 27 19:08:59 UTC 2008


Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5672

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b06
- Removed iconv of THIRD_PARTY_README.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- java-1.6.0-openjdk.spec	27 Mar 2008 17:39:29 -0000	1.14
+++ java-1.6.0-openjdk.spec	27 Mar 2008 19:08:23 -0000	1.15
@@ -443,9 +443,6 @@
 # Install Javadoc documentation.
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-#FIXME: This needs to be fixed upstream.
-iconv -f ISO_8859-1 -t UTF8 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README \
-  -o $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README
 
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
@@ -790,6 +787,9 @@
 
 %changelog
 * Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b06
+- Removed iconv of THIRD_PARTY_README.
+
+* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b06
 - Updated icedteasnapshot.
 - Updated openjdkver and openjdkdate.
 - Removed java-1.6.0-openjdk-trademark.patch.




More information about the fedora-extras-commits mailing list