rpms/openvrml/F-11 .cvsignore, 1.20, 1.21 openvrml.spec, 1.61, 1.62 sources, 1.20, 1.21 npfunctions.patch, 1.5, NONE

[Braden McDaniel]

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8194/F-11

Modified Files:
	.cvsignore openvrml.spec sources 
Removed Files:
	npfunctions.patch 
Log Message:
Updated to 0.18.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	23 Mar 2009 10:05:41 -0000	1.20
+++ .cvsignore	6 Jul 2009 03:53:52 -0000	1.21
@@ -1 +1 @@
-openvrml-0.17.12.tar.gz
+openvrml-0.18.1.tar.gz


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- openvrml.spec	23 Mar 2009 10:05:41 -0000	1.61
+++ openvrml.spec	6 Jul 2009 03:53:52 -0000	1.62
@@ -1,29 +1,32 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.17.12
+Version:        0.18.1
 Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
-Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch0:         npfunctions.patch
+Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  pkgconfig >= 0.12.0
-BuildRequires:  boost-devel >= 1.34.1
+BuildRequires:  pkgconfig >= 0.18.0
+BuildRequires:  boost-devel >= 1.37.0
+BuildRequires:  libxml2-devel >= 2.5
 BuildRequires:  libpng-devel >= 1.0.12
 BuildRequires:  libjpeg-devel >= 6b
 BuildRequires:  fontconfig-devel >= 2.0
 BuildRequires:  freetype-devel >= 2.1.2
-BuildRequires:  gecko-devel >= 1.9
+BuildRequires:  gecko-devel >= 1.9.1
 BuildRequires:  libGLU-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  glib2-devel >= 2.6
 BuildRequires:  dbus-glib-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk2-devel >= 2.12
+BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
-Requires:       gecko-libs >= 1.9
+BuildRequires:  java-devel
+Requires:       gecko-libs >= 1.9.1
+Requires:       java
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -34,13 +37,13 @@ for reading and displaying VRML and X3D 
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-Requires:       boost-devel >= 1.34.1
+Requires:       pkgconfig >= 0.18.0
+Requires:       boost-devel >= 1.37.0
 Requires:       libpng-devel
 Requires:       libjpeg-devel
 Requires:       fontconfig-devel
 Requires:       freetype-devel
-Requires:       gecko-devel >= 1.9
+Requires:       gecko-devel >= 1.9.1
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -57,10 +60,8 @@ Summary:        OpenVRML OpenGL renderer
 Group:          Development/Libraries
 Requires:       %{name}-gl = %{version}-%{release}
 Requires:       %{name}-devel = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       pkgconfig >= 0.18.0
 Requires:       libGLU-devel
-Requires:       libXmu-devel
-Requires:       gtk2-devel
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -93,24 +94,29 @@ Requires:       dbus-x11
 %description player
 VRML/X3D player.  Hosts the OpenVRML XEmbed control.
 
+%package doc
+Summary:        Documentation for OpenVRML
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+%description doc
+
 %prep
 %setup
-%patch0 -p1
 
 %build
 CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden -Wno-missing-braces"
-%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" BOOST_LIB_SUFFIX="-mt"
-# vrml97node.cpp and browser.cpp are huge and need a lot of RAM.
-if [ `free -b | awk '/^Mem:/{print $2}'` -gt 4000000000 ]; then
+%configure --disable-static --enable-exception-specs=nothrow --disable-examples CPPFLAGS="-I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" JAVA_HOME=/usr/lib/jvm/jre
 %{__make} %{_smp_mflags}
-else
-%{__make}
-fi
+
+%check
+%{__make} %{_smp_mflags} check
 
 %install
 %{__make} DESTDIR=%{buildroot} install
 %{__rm} %{buildroot}%{_libdir}/*.la
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
+%{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
+%{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -121,11 +127,20 @@ fi
 
 %files
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
+%dir %{_datadir}/openvrml
+%dir %{_datadir}/openvrml/component
+%{_datadir}/openvrml/component/*.xml
+%dir %{_datadir}/openvrml/java
+%{_datadir}/openvrml/java/script.jar
 %{_libdir}/libopenvrml.so.*
+%dir %{_libdir}/openvrml
+%dir %{_libdir}/openvrml/node
+%{_libdir}/openvrml/node/*.so
+%dir %{_libdir}/openvrml/script
+%{_libdir}/openvrml/script/*.so
 
 %files devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
-%doc doc/manual
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/openvrml-common.h
 %{_includedir}/%{name}/openvrml-config.h
@@ -143,16 +158,15 @@ fi
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_libdir}/libopenvrml-gl.so.*
 
-
 %files gl-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_includedir}/%{name}/openvrml-gl-common.h
 %{_includedir}/%{name}/openvrml-gl-config.h
-%{_includedir}/%{name}/openvrml/gl
+%dir %{_includedir}/%{name}/openvrml/gl
+%{_includedir}/%{name}/openvrml/gl/*.h
 %{_libdir}/libopenvrml-gl.so
 %{_libdir}/pkgconfig/openvrml-gl.pc
 
-
 %files xembed
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_libexecdir}/openvrml-xembed
@@ -171,11 +185,19 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/openvrml-player
 %dir %{_datadir}/openvrml-player
-%dir %{_datadir}/openvrml-player/glade
-%{_datadir}/openvrml-player/glade/openvrml-player.glade
-
-
+%dir %{_datadir}/openvrml-player/ui
+%{_datadir}/openvrml-player/ui/openvrml-player.ui
+  
+%files doc
+%doc doc/manual
+%{_javadocdir}/%{name}-%{version}
+  
 %changelog
+* Sun Jul 05 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.1-1
+- Updated to 0.18.1.
+- Put documentation in doc subpackage.
+- Added check phase back.
+
 * Mon Mar 23 2009  Braden McDaniel  <braden at endoframe.com> - 0.17.12-1
 - Updated to 0.17.12.
 - Only build with _smp_mflags if the machine has at least 4 GB of RAM.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	23 Mar 2009 10:05:41 -0000	1.20
+++ sources	6 Jul 2009 03:53:52 -0000	1.21
@@ -1 +1 @@
-162153ee2e5c498b31f600193ebabe58  openvrml-0.17.12.tar.gz
+01b7134886f4ef13d638daf02b330cda  openvrml-0.18.1.tar.gz


--- npfunctions.patch DELETED ---