rpms/jogl/devel .cvsignore, 1.2, 1.3 jogl.properties, 1.1, 1.2 jogl.spec, 1.16, 1.17 sources, 1.2, 1.3

Sun Jul 30 19:55:28 UTC 2006

Author: green

Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1308

Modified Files:
	.cvsignore jogl.properties jogl.spec sources 
Log Message:
Update sources.  



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	3 Sep 2005 17:51:45 -0000	1.2
+++ .cvsignore	30 Jul 2006 19:55:28 -0000	1.3
@@ -1 +1 @@
-jogl-src.zip
+jogl-src-1_0_0-beta05.zip


Index: jogl.properties
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jogl.properties	3 Sep 2005 17:51:45 -0000	1.1
+++ jogl.properties	30 Jul 2006 19:55:28 -0000	1.2
@@ -18,7 +18,7 @@
 # Windows
 # antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar
 # Linux
-antlr.jar=/usr/share/java/antlr-2.7.4.jar
+antlr.jar=/usr/share/java/antlr-2.7.6.jar
 # Mac OS X
 # antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
 # Solaris


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jogl.spec	30 Jul 2006 03:17:18 -0000	1.16
+++ jogl.spec	30 Jul 2006 19:55:28 -0000	1.17
@@ -1,26 +1,28 @@
 ExclusiveArch: %{ix86} ppc
 
 Name:           jogl
-Version:        1.1.1
-Release:        14.1%{?dist}
+Version:        1.0.0
+Release:        1.0.beta5%{?dist}
 Summary:        Java bindings for the OpenGL API
 
+# Increment the epoch because Sun decided to reset their version
+# numbers back.
+Epoch:          1
+
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://jogl.dev.java.net/
-Source0:        jogl-src.zip
+Source0:        jogl-src-1_0_0-beta05.zip
 Source1:        jogl.properties
 Source2:        SGIFreeSWLicB.1.1.ps
-Source3:        jogl-README.txt
-Patch0:		jogl-ppc.patch
-Patch1:		jogl-nojavadoclink.patch
-Patch2:		jogl-ppctools.patch
-Patch3:		jogl-ModularX.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, antlr, ant-antlr, jpackage-utils >= 1.5
-BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, libX11-devel, libXau-devel, libXext-devel, libXxf86vm-devel, libXdmcp-devel
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel, libX11-devel,
+BuildRequires:  libXau-devel, libXext-devel, libXxf86vm-devel, libXdmcp-devel
+
 Requires:	mesa-libGL, mesa-libGLU
+
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
@@ -37,23 +39,19 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-#BuildRequires:  java-javadoc
 
 %description    javadoc
 %{summary}.
 
 %prep
-%setup -q -n jogl
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%setup -q -c jogl-%{version}
 cp %{SOURCE1} .
 cp %{SOURCE2} .
-cp %{SOURCE3} .
 
 %build
 
+cd jogl
+
 TARGET=linux
 %ifarch ppc
 TARGET=linux.ppc
@@ -67,12 +65,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd jogl
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}
-install -pm 755 build/obj/libjogl.so $RPM_BUILD_ROOT%{_libdir}/libjogl.so
+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 -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pR javadoc_jogl_dev/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -83,23 +85,19 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_bindir}/rebuild-gcj-db
-ldconfig
-
-%postun
-%{_bindir}/rebuild-gcj-db
-ldconfig
+%post -p %{_bindir}/rebuild-gcj-db
+
+%postun -p %{_bindir}/rebuild-gcj-db
 
 %files
 %defattr(644,root,root,755)
 %doc SGIFreeSWLicB.1.1.ps
-%doc jogl-README.txt
-%doc doc/*
+%doc jogl/README.txt
+%doc jogl/LICENSE.txt
+%doc jogl/doc/*
 %{_javadir}/*.jar
 %{_libdir}/gcj/*
 %{_libdir}/*.so
-# %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -107,8 +105,13 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
-* Sat Jul 29 2006 Anthony Green <green at redhat.com> - 0:1.1.1-14.1
+* Sat Jul 29 2006 Anthony Green <green at redhat.com> - 1:1.0.0-1.0.beta5
 - Rebuild again with another new compiler.
+- Update antlr reference in jogl.properties.
+- Update to latest JSR231 beta sources.
+- Add libjogl_drihack.so and libjogl_awt.so.
+- Drop jogl-README.txt.
+- Remove ldconfig.
 
 * Wed Mar  1 2006 Anthony Green <green at redhat.com> - 0:1.1.1-14
 - Rebuild again with another new compiler.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2005 17:51:45 -0000	1.2
+++ sources	30 Jul 2006 19:55:28 -0000	1.3
@@ -1 +1 @@
-a5d6b630a17b41227ab41506c826277b  jogl-src.zip
+49e56459cc0b6d935e724794df29c790  jogl-src-1_0_0-beta05.zip


