[cortado] Fix building with the latest openjdk
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Jan 15 14:00:11 UTC 2012
commit 8c5929396b3ed9e2d78414dbe66068ccf926377d
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Jan 15 15:01:22 2012 +0100
Fix building with the latest openjdk
cortado.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/cortado.spec b/cortado.spec
index 0bc5bed..ed0d992 100644
--- a/cortado.spec
+++ b/cortado.spec
@@ -1,13 +1,12 @@
Name: cortado
Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java media framework
URL: http://www.theora.org/cortado/
# The codecs are all LGPLv2+, the jst framework is mixed, the player applet GPL
License: LGPLv2+ and GPLv2+
Group: System Environment/Libraries
Source0: http://downloads.xiph.org/releases/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils java-devel jorbis
Requires: java jpackage-utils jorbis
@@ -31,6 +30,11 @@ This package contains the API documentation for %{name}.
rm -fr src/com/jcraft
# We don't want to include the examples in the jar we build
mv src/com/fluendo/examples .
+# javac does not like the UTF-8 x, ∗, − and ’ symbols used in the comments
+sed -i "s/×/x/g" src/com/fluendo/jheora/Quant.java
+sed -i "s/∗/*/g" src/com/fluendo/jheora/Quant.java
+sed -i "s/−/-/g" src/com/fluendo/jheora/Quant.java
+sed -i "s/’/'/g" src/com/fluendo/jheora/Quant.java
%build
@@ -44,29 +48,25 @@ javadoc -d doc -public `find src -name "*.java"`
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -a src/%{name}.jar $RPM_BUILD_ROOT%{_javadir}
cp -a doc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc ChangeLog HACKING LICENSE.* NEWS README RELEASE TODO examples
%{_javadir}/%{name}.jar
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.*
%doc %{_javadocdir}/%{name}
%changelog
+* Sun Jan 15 2012 Hans de Goede <hdegoede at redhat.com> - 0.6.0-5
+- Fix building with the latest openjdk
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list