- updated netscape/mozilla paths, also in config and mozilla patches

- removed Provides which is autodetected by new rpm-perlprov (BR it)
- plugins Require base package

Changed files:
    freewrl-config.patch -> 1.3
    freewrl-mozilla.patch -> 1.2
    freewrl.spec -> 1.7

diff --git a/freewrl-config.patch b/freewrl-config.patch
index 252ed31915530267bb77e9024f7c4edcd692541f..c6af348eab185633111cd52e3fcfb942a511cb12 100644 (file)
--- a/freewrl-config.patch
+++ b/freewrl-config.patch
@@ -6,7 +6,7 @@ diff -urN freewrl-0.34.orig/vrml.conf freewrl-0.34/vrml.conf
  
  # Saxon location - required for x3d running.
 -    SAXON_LOC => '/usr/local/src/saxon/saxon.jar',
-+    SAXON_LOC => '/usr/share/java/classes/saxon.jar',
++    SAXON_LOC => '/usr/share/java/saxon.jar',
  
  # Netscape installation
  # 
@@ -18,8 +18,8 @@ diff -urN freewrl-0.34.orig/vrml.conf freewrl-0.34/vrml.conf
 -    NETSCAPE_CLASSES => '/usr/lib/netscape/java/classes',
 -    NETSCAPE_PLUGINS => '/usr/lib/netscape/plugins',
 +    NETSCAPE_INST => '',
-+    NETSCAPE_CLASSES => '/usr/X11R6/lib/netscape/java/classes',
-+    NETSCAPE_PLUGINS => '/usr/X11R6/lib/netscape/plugins',
++    NETSCAPE_CLASSES => '/usr/lib/netscape/java/classes',
++    NETSCAPE_PLUGINS => '/usr/lib/netscape/plugins',
  
  # Mozilla installation
  # 
@@ -30,9 +30,9 @@ diff -urN freewrl-0.34.orig/vrml.conf freewrl-0.34/vrml.conf
 -    MOZILLA_INST => '',
 -    MOZILLA_PLUGINS => '',
 -    MOZILLA_INC => '',
-+    MOZILLA_INST => '/usr/X11R6/lib/mozilla',
-+    MOZILLA_PLUGINS => '/usr/X11R6/lib/mozilla/plugins',
-+    MOZILLA_INC => '/usr/X11R6/include/mozilla',
++    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.3.1)

diff --git a/freewrl-mozilla.patch b/freewrl-mozilla.patch
index 8ca8630c515144c3f0433695cb73c10749be3b9a..505eb3cfba1447129c471b46a6a6070f90f733a5 100644 (file)
--- a/freewrl-mozilla.patch
+++ b/freewrl-mozilla.patch
@@ -6,14 +6,14 @@ diff -urN freewrl-0.34.orig/Plugin/mozilla/Makefile freewrl-0.34/Plugin/mozilla/
  ifndef ${MOZILLA_INST}
 
 -MOZILLA_INST:=/usr/lib/mozilla-1.0.0
-+MOZILLA_INST:=/usr/X11R6/lib/mozilla
++MOZILLA_INST:=/usr/lib/mozilla
 
  endif
 
  ifndef ${MOZILLA_INC}
 
 -MOZILLA_INC:=/usr/include/mozilla-1.0.0
-+MOZILLA_INC:=/usr/X11R6/include/mozilla
++MOZILLA_INC:=/usr/include/mozilla
 
  endif
  
@@ -22,7 +22,7 @@ diff -urN freewrl-0.34.orig/Plugin/mozilla/Makefile freewrl-0.34/Plugin/mozilla/
  INC:=\
       -Iinclude\
 +     -I/usr/include/nspr\
-+     -I/usr/X11R6/include/gtk-1.2\
++     -I/usr/include/gtk-1.2\
       -I${PLUGIN_GLUE_DIR}/CFuncs\
       -I${MOZILLA_INC}/plugin\
       -I${MOZILLA_INC}/xpcom\

diff --git a/freewrl.spec b/freewrl.spec
index 56a74dc0c31d2f48204bf5e935ef921191c4ed29..c28849ad5c07bd3ca346b7d7bd8d002efa6692ab 100644 (file)
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -22,15 +22,13 @@ BuildRequires:      jdk
 BuildRequires: js-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: perl-devel
-BuildRequires: rpm-perlprov
+BuildRequires: perl-devel >= 5.8.0
+BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: saxon
-# not found by perlprov from rpm 4.1
-Provides:      perl(VRML::Config)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                mozilladir      /usr/X11R6/lib/mozilla
-%define                netscapedir     /usr/X11R6/lib/netscape
+%define                mozilladir      /usr/lib/mozilla
+%define                netscapedir     /usr/lib/netscape
 
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
 # false positives found by perlreq from rpm 4.1
@@ -46,6 +44,7 @@ FreeWRL - przegl
 Summary:       VRML plugin for Mozilla WWW browser
 Summary(pl):   Wtyczka VRML dla przegl±darki WWW Mozilla
 Group:         Libraries
+Requires:      %{name} = %{version}
 
 %description -n mozilla-plugin-freewrl
 VRML plugin for Mozilla WWW browser.
@@ -57,6 +56,7 @@ Wtyczka VRML dla przegl
 Summary:       VRML plugin for Netscape WWW browser
 Summary(pl):   Wtyczka VRML dla przegl±darki WWW Netscape
 Group:         Libraries
+Requires:      %{name} = %{version}
 
 %description -n netscape-plugin-freewrl
 VRML plugin for Netscape WWW browser.
@@ -78,7 +78,7 @@ Wtyczka VRML dla przegl
 %{__make} \
        OPTIMIZE="%{rpmcflags}" \
        OPTIMIZER="%{rpmcflags}" \
-       MOZILLA_INC="/usr/X11R6/include/mozilla"
+       MOZILLA_INC="/usr/include/mozilla"
 
 %{__make} -C Plugin/netscape \
        OPTIMIZER="%{rpmcflags}"