Attachment 602385 Details for Bug 832853 – Suggested changes to java3d.spec

[patch] Suggested changes to java3d.spec

java3d.spec.patch (text/plain), 2.44 KB, created by Joachim Katzer on 2012-08-05 20:46:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joachim Katzer

Created: 2012-08-05 20:46:16 UTC

Size: 2.44 KB

patch

obsolete

>--- java3d.spec	2012-07-14 08:25:31.000000000 +0200
>+++ java3d-jk.spec	2012-08-05 22:30:23.445670064 +0200
>@@ -27,6 +27,7 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #
>+%define debug_package %{nil}
> 
> Summary:	Java 3D
> URL:		http://java3d.java.net/
>@@ -34,9 +35,9 @@ Name:		java3d
> License:	BSD and GPLv2
> Group:		Development/Libraries
> Version:	1.5.2
>-Release:	2%{?dist}
>+Release:	3%{?dist}.jk
> 
>-BuildArch:	noarch
>+# BuildArch:	noarch
> 
> Source0:	java3d-%{version}.tgz
> Patch0:		java3d-1.5.2-jpeg-codec.patch
>@@ -47,9 +48,11 @@ Patch1:		java3d-1.5.2-vecmath.patch
> Source100:	java3d-1.5.2-buildtarball.sh
> 
> BuildRequires:	ant
>+BuildRequires:	ant-nodeps
> BuildRequires:	java-devel >= 1:1.6.0
> BuildRequires:	jpackage-utils
> BuildRequires:	vecmath
>+BuildRequires:	mesa-libGLw-devel
> 
> Requires:	java >= 1:1.6.0
> Requires:	jpackage-utils
>@@ -112,15 +115,18 @@ pushd j3d-core
> popd
> 
> %install
>+rm -rf %{buildroot}
> export NO_BRP_CHECK_BYTECODE_VERSION=true
> 
>-%__install -dm 755 %{buildroot}%{_javadir}/%{name}
> %__install -dm 755 %{buildroot}%{_libdir}
>+%__install -dm 755 %{buildroot}%{_jnidir}/%{name}
> %__install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
> 
> # jars
> %__install -m 644 j3d-core/build/default/opt/lib/ext/*.jar \
>-		%{buildroot}%{_javadir}/%{name}
>+		%{buildroot}%{_jnidir}/%{name}
>+%__install -m 755 j3d-core/build/default/opt/native/*.so \
>+		%{buildroot}%{_jnidir}/%{name}
> 
> # javadoc
> %__cp -a j3d-core/build/*/javadocs/docs-public/* \
>@@ -128,25 +134,36 @@ export NO_BRP_CHECK_BYTECODE_VERSION=tru
> 
> ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
> 
>+%clean
>+rm -rf %{buildroot}
>+
> 
> %files
>+%defattr(-, root, root, -)
> %doc j3d-core/*.txt
> %doc j3d-core/*.html
> %doc j3d-core/docs
>-%dir %{_javadir}/%{name}
>-%{_javadir}/%{name}/*.jar
>+%dir %{_jnidir}/%{name}
>+%{_jnidir}/%{name}/*.jar
>+%{_jnidir}/%{name}/*.so
> 
> 
> %files javadoc
>+%defattr(-, root, root, -)
> %doc %{_javadocdir}/%{name}-%{version}
> %doc %{_javadocdir}/%{name}
> 
> 
> %files examples
>+%defattr(-, root, root, -)
> %doc j3d-examples/
> 
> 
> %changelog
>+* Fri Aug  3 2012 Joachim Katzer <JoKatzer@gmx.de> - 1.5.2-3
>+- Added missing build requirements
>+- Added missing libj3dcore-ogl.so
>+
> * Sat Jul 14 2012 Eric Smith <eric@brouhaha.com> - 1.5.2-2
> - Added patch from Debian to use ImageIO methods instead of deprecated
>   JPEG codec, to allow building on OpenJDK 7.

Actions: View | Diff

Attachments on bug 832853: 602385