Attachment 147525 Details for Bug 227597 – Use $RPM_OPT_FLAGS, fix file permissions and build directly from CVS

[patch] Use $RPM_OPT_FLAGS, fix file permissions and build directly from CVS

jogl.patch (text/plain), 1.70 KB, created by Ville Skyttä on 2007-02-06 23:21:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-02-06 23:21:46 UTC

Size: 1.70 KB

patch

obsolete

>Index: jogl.spec
>===================================================================
>RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
>retrieving revision 1.27
>diff -u -r1.27 jogl.spec
>--- jogl.spec	4 Oct 2006 23:25:47 -0000	1.27
>+++ jogl.spec	6 Feb 2007 23:20:31 -0000
>@@ -50,9 +50,15 @@
> %patch3 -p0
> cp %{SOURCE1} .
> cp %{SOURCE2} .
>+cat << EOF > gcc
>+#!/bin/sh
>+%{_bindir}/gcc $RPM_OPT_FLAGS "\$@"
>+EOF
>+chmod +x gcc
> 
> %build
> 
>+export PATH="$(pwd):$PATH" # for our gcc wrapper
> cd jogl
> 
> TARGET=linux
>@@ -60,7 +66,7 @@
> TARGET=linux.ppc
> %endif
> 
>-(cd make && ant -Duser.home=%{_topdir}/SOURCES $TARGET javadoc.dev.x11)
>+(cd make && ant -Duser.home=$RPM_SOURCE_DIR $TARGET javadoc.dev.x11)
> 
> # Rename the jar into a versioned jar name and create the .so version.
> mv build/jogl.jar build/%{name}-%{version}.jar
>@@ -75,9 +81,9 @@
> ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> install -dm 755 $RPM_BUILD_ROOT%{_libdir}
>-install -pm 766 build/obj/libjogl.so $RPM_BUILD_ROOT%{_libdir}/libjogl.so
>-install -pm 766 build/obj/libjogl_awt.so $RPM_BUILD_ROOT%{_libdir}/libjogl_awt.so
>-install -pm 766 build/obj/libjogl_drihack.so $RPM_BUILD_ROOT%{_libdir}/libjogl_drihack.so
>+install -pm 755 build/obj/libjogl.so $RPM_BUILD_ROOT%{_libdir}
>+install -pm 755 build/obj/libjogl_awt.so $RPM_BUILD_ROOT%{_libdir}
>+install -pm 755 build/obj/libjogl_drihack.so $RPM_BUILD_ROOT%{_libdir}
> 
> install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
> cp -pR javadoc_jogl_dev/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>@@ -93,7 +99,7 @@
> %postun -p %{_bindir}/rebuild-gcj-db
> 
> %files
>-%defattr(644,root,root,755)
>+%defattr(-,root,root,755)
> %doc SGIFreeSWLicB.1.1.ps
> %doc jogl/README.txt
> %doc jogl/LICENSE.txt

Actions: View | Diff

Attachments on bug 227597: 147525