- drop remnaints from browser-plugins v1

[packages/freewrl.git] / freewrl.spec

diff --git a/freewrl.spec b/freewrl.spec
index 24e6d40ad05b7277fc3f0869cf83cc27fdcc6bdc..2f7a2cbf213d6aaacb1034cde17807bb465347a0 100644 (file)
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -1,7 +1,6 @@
 # TODO:
 # - install fonts system-wide (subpackage?)
-# - CC not always honoured
-# - ?? add more to optimize.patch
+# - install one copy of vrml.jar
 %include       /usr/lib/rpm/macros.perl
 %define                pdir    VRML
 %define                pnam    VRMLFunc
@@ -9,26 +8,27 @@ Summary:      FreeWRL - VRML/X3D browser
 Summary(pl.UTF-8):     FreeWRL - przeglądarka VRM/X3D
 Name:          freewrl
 Version:       1.19.8
-Release:       0.1
-License:       LGPL
+Release:       1
+License:       LGPL v2
 Group:         X11/Applications/Graphics
 Source0:       http://dl.sourceforge.net/freewrl/%{name}-%{version}.tar.gz
 # Source0-md5: c193a1eb6e88c4253b6aec02098a9d3c
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-makefile.patch
-#Patch2:               %{name}-system-js.patch
-#Patch3:               %{name}-optimize.patch
+Patch2:                %{name}-system-js.patch
+Patch3:                %{name}-optimize.patch
 URL:           http://freewrl.sourceforge.net/
 BuildRequires: ImageMagick-devel
 BuildRequires: OpenGL-devel
 BuildRequires: freetype-devel >= 2.0
-BuildRequires: java-sun
+BuildRequires: jdk
+BuildRequires: js-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: openmotif-devel
+BuildRequires: motif-devel
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.236
+BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: saxon
 BuildRequires: xorg-lib-libXaw-devel
 %ifarch %{x8664} ia64 ppc64 s390x sparc64
@@ -39,8 +39,6 @@ Provides:     libFreeWRLFunc.so
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                browsers mozilla, mozilla-firefox, konqueror, seamonkey
-
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
 # false positives found by perlreq from rpm 4.1
 %define                _noautoreq      'perl(VRML::Events)' 'perl(VRML::VRMLCU)' 'perl(VRML::VRMLFields)' 'perl(VRML::VRMLNodes)' 'perl(VRMLFields)' 'perl(VRMLNodes)' 'perl(VRMLRend)'
@@ -56,7 +54,7 @@ Summary:      VRML/X3D plugin for WWW browser
 Summary(pl.UTF-8):     Wtyczka VRML/X3D dla przeglądarki WWW
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      browser-plugins(%{_target_base_arch})
+Requires:      browser-plugins >= 2.0
 Obsoletes:     konqueror-plugin-freewrl
 Obsoletes:     mozilla-firefox-plugin-freewrl
 Obsoletes:     mozilla-plugin-freewrl
@@ -65,22 +63,19 @@ Obsoletes:  netscape-plugin-freewrl
 %description -n browser-plugin-%{name}
 VRML and X3D plugin for WWW browser.
 
-Supported browsers: %{browsers}.
-
 %description -n browser-plugin-%{name} -l pl.UTF-8
 Wtyczka VRML i X3D dla przeglądarki WW.
 
-Obsługiwane przeglądarki: %{browsers}.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
+
+# avoid using included js
+rm -rf JS
 
-# this file causes unnecessary/unwanted rebuilds of JS module
-rm -f JS/Makefile.aqua.PL
 %{__sed} -i -e 's#\(NETSCAPE_\(INST\|CLASSES\|PLUGINS\)\) =>.*#\1 => "%{_browserpluginsdir}",#' vrml.conf*
 
 %build
@@ -90,7 +85,6 @@ rm -f JS/Makefile.aqua.PL
 %{__make} -j1 \
        CC="%{__cc}" \
        OPTIMIZE="%{rpmcflags}" \
-       OPTIMIZER="%{rpmcflags}" \
        DESTINSTALLPRIVLIB=%{perl_vendorlib}
 
 %{__make} -C Plugin \
@@ -105,7 +99,8 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_browserpluginsdir},%{perl_vendorlib}/VR
        DESTDIR=$RPM_BUILD_ROOT \
        SITEARCHEXP=$RPM_BUILD_ROOT%{perl_vendorarch} \
        DESTINSTALLPRIVLIB=$RPM_BUILD_ROOT%{perl_vendorlib} \
-       PLUGDIR=%{_browserpluginsdir}
+       PLUGDIR=%{_browserpluginsdir} \
+       CHCON=true
 
 # specified in java/classes/Makefile.PL, but finally not installed
 install java/classes/vrml.jar $RPM_BUILD_ROOT%{perl_vendorlib}/VRML
@@ -116,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/{COPYRIGHT,README,RELEASENOTES}.T
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %post -n browser-plugin-%{name}
 %update_browser_plugins
 
@@ -126,10 +124,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README.html
-%attr(755,root,root) %{_bindir}/*
+%doc CHANGELOG README.html
+%attr(755,root,root) %{_bindir}/FreeWRL_Message
+%attr(755,root,root) %{_bindir}/FreeWRL_SoundServer
+%attr(755,root,root) %{_bindir}/freewrl
 %attr(755,root,root) %{_libdir}/libFreeWRLFunc.so
-%attr(755,root,root) %{_libdir}/libFreeWRLjs.so
 %dir %{perl_vendorlib}/VRML
 %{perl_vendorlib}/VRML/java.policy
 %{perl_vendorlib}/VRML/vrml.jar
@@ -142,5 +141,5 @@ fi
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_browserpluginsdir}/*.so
-%attr(755,root,root) %{_browserpluginsdir}/vrml.jar
+%attr(755,root,root) %{_browserpluginsdir}/npfreewrl.so
+%{_browserpluginsdir}/vrml.jar