- up to 1.03, updated config patch

- mozilla plugin seems gone, but netscape version works OK with mozilla
  (without Java/EAI... but it didn't work before either - don't know how
   to make mozilla+java load vrml.jar without placing it in evil localtion)

Changed files:
    freewrl-config.patch -> 1.7
    freewrl.spec -> 1.16

diff --git a/freewrl-config.patch b/freewrl-config.patch
index 21d1bd0b4e109f56cfa15525816cbed5c50bb788..9eabd31090326542b1ce296bdf7a6f6fcd8e55a6 100644 (file)
--- a/freewrl-config.patch
+++ b/freewrl-config.patch
@@ -23,19 +23,7 @@ diff -urN freewrl-0.34.orig/vrml.conf freewrl-0.34/vrml.conf
  
  ############################################################################
  # Mozilla development plugin installation
-@@ -39,17 +39,17 @@
- #   MOZILLA_PLUGINS => '/usr/lib/mozilla-1.0.0/plugins',
- #   MOZILLA_INC => '/usr/include/mozilla-1.0.0',
- 
--    MOZILLA_INST => '',
--    MOZILLA_PLUGINS => '',
--    MOZILLA_INC => '',
-+    MOZILLA_INST => '/usr/lib/mozilla',
-+    MOZILLA_PLUGINS => '/usr/lib/mozilla/plugins',
-+    MOZILLA_INC => '/usr/include/mozilla',
- 
- ############################################################################
- # Java installation (Sun's Java 2 SDK Standard Edition 1.4.0)
+@@ -39,9 +39,9 @@
  # If Java is not installed, leave JAVA_INST empty e.g.
  # JAVA_INST => ''
  

diff --git a/freewrl.spec b/freewrl.spec
index 2cc215990334684c6b38e2ebc6fac1871f8f18a9..c62837f3300c3b2e63eaa9c2a035da8e960afa55 100644 (file)
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -4,12 +4,12 @@
 Summary:       FreeWRL - VRML browser
 Summary(pl):   FreeWRL - przegl±darka VRML
 Name:          freewrl
-Version:       1.02
+Version:       1.03
 Release:       1
 License:       LGPL
 Group:         X11/Applications/Graphics
 Source0:       http://dl.sourceforge.net/freewrl/FreeWRL-%{version}.tar.gz
-# Source0-md5: 6af5a46a8dff01d973c76201a34d57ac
+# Source0-md5: cb4435f5f64cebd6b0cc5cf831fb186f
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-mozilla.patch
@@ -75,8 +75,9 @@ Wtyczka VRML dla przegl
 %setup -q -n FreeWRL-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+# for mozilla plugin - removed intentionaly?
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
 
 %build
@@ -84,9 +85,9 @@ Wtyczka VRML dla przegl
        INSTALLDIRS=vendor
 %{__make} \
        OPTIMIZE="%{rpmcflags}" \
-       OPTIMIZER="%{rpmcflags}" \
-       MOZILLA_INC="/usr/include/mozilla" \
-       GTK_CONFIG="pkg-config gtk+-2.0"
+       OPTIMIZER="%{rpmcflags}"
+#      MOZILLA_INC="/usr/include/mozilla" \
+#      GTK_CONFIG="pkg-config gtk+-2.0"
 
 %{__make} -C Plugin/netscape \
        OPTIMIZER="%{rpmcflags}"
@@ -99,9 +100,14 @@ install -d $RPM_BUILD_ROOT{%{mozilladir}/{plugins,java/classes},%{netscapedir}/p
        DESTDIR=$RPM_BUILD_ROOT \
        SITEARCHEXP=$RPM_BUILD_ROOT%{perl_vendorarch}
 
-install Plugin/mozilla/_lib/npFreeWRL.so $RPM_BUILD_ROOT%{mozilladir}/plugins
+#install Plugin/mozilla/_lib/npFreeWRL.so $RPM_BUILD_ROOT%{mozilladir}/plugins
+
+install Plugin/netscape/_lib/npfreewrl.so $RPM_BUILD_ROOT%{mozilladir}/plugins
 install Plugin/netscape/_lib/npfreewrl.so $RPM_BUILD_ROOT%{netscapedir}/plugins
-install java/classes/vrml.jar $RPM_BUILD_ROOT%{mozilladir}/java/classes
+
+# no such directory, don't know how to make mozilla+java load this jar
+# without placing it in /usr/lib/java/jre/lib/ext :/
+#install java/classes/vrml.jar $RPM_BUILD_ROOT%{mozilladir}/java/classes
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,10 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mozilla-plugin-freewrl
 %defattr(644,root,root,755)
-%{mozilladir}/java/classes/*
-%{mozilladir}/plugins/*
+%attr(755,root,root) %{mozilladir}/plugins/*.so
 
 %files -n netscape-plugin-freewrl
 %defattr(644,root,root,755)
-%{netscapedir}/java/classes/*
-%{netscapedir}/plugins/*
+%{netscapedir}/java/classes/*.jar
+%attr(755,root,root) %{netscapedir}/plugins/*.so