X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreewrl.git;a=blobdiff_plain;f=freewrl.spec;h=7c0691592026717bf2ed7cf62bf41d4feb89d068;hp=b85952cbd2e80a425a412078b4c73d7ff254d82e;hb=140731f84e0d3111c0c12fded3cd59cf86886d96;hpb=1d9c6ce6954a392ec7a4478f552bbfcd32b53010

diff --git a/freewrl.spec b/freewrl.spec
index b85952c..7c06915 100644
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -1,81 +1,72 @@
 # 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
-Summary:	FreeWRL - VRML browser
-Summary(pl):	FreeWRL - przegl±darka VRML
+Summary:	FreeWRL - VRML/X3D browser
+Summary(pl.UTF-8):	FreeWRL - przeglądarka VRM/X3D
 Name:		freewrl
-Version:	1.17.4
-Release:	0.2
-License:	LGPL
+Version:	1.19.8
+Release:	2
+License:	LGPL v2
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/freewrl/%{name}-%{version}.tar.gz
-# Source0-md5:	0c4e7d91b51c593d37ca190d112c869e
+# Source0-md5:	c193a1eb6e88c4253b6aec02098a9d3c
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-make.patch
+Patch1:		%{name}-makefile.patch
 Patch2:		%{name}-system-js.patch
 Patch3:		%{name}-optimize.patch
 URL:		http://freewrl.sourceforge.net/
-BuildRequires:	ImageMagick
+BuildRequires:	ImageMagick-devel
 BuildRequires:	OpenGL-devel
-BuildRequires:	X11-devel
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	jar
 BuildRequires:	jdk
 BuildRequires:	js-devel
-BuildRequires:	lesstif-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
-BuildRequires:	mozilla-devel
-BuildRequires:	mozilla-embedded(gtk2)
+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
 Provides:	libFreeWRLFunc.so()(64-bit)
 %else
 Provides:	libFreeWRLFunc.so
 %endif
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+# jdk only these platforms
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_libdir}/browser-plugins
-%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)'
 
 %description
-FreeWRL - VRML browser.
+FreeWRL - VRML/X3D browser.
 
-%description -l pl
-FreeWRL - przegl±darka VRML.
+%description -l pl.UTF-8
+FreeWRL - przeglądarka VRM/X3D.
 
 %package -n browser-plugin-%{name}
-Summary:	VRML plugin for WWW browser
-Summary(pl):	Wtyczka VRML dla przegl±darki WWW
+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
 Obsoletes:	netscape-plugin-freewrl
 
 %description -n browser-plugin-%{name}
-VRML plugin for Mozilla WWW browser.
-
-Supported browsers: %{browsers}.
-
-%description -n browser-plugin-%{name} -l pl
-Wtyczka VRML dla przegl±darki WWW Mozilla.
+VRML and X3D plugin for WWW browser.
 
-Obs³ugiwane przegl±darki: %{browsers}.
+%description -n browser-plugin-%{name} -l pl.UTF-8
+Wtyczka VRML i X3D dla przeglądarki WW.
 
 %prep
 %setup -q
@@ -84,17 +75,18 @@ Obs
 %patch2 -p1
 %patch3 -p1
 
-# this file causes unnecessary/unwanted rebuilds of JS module
-rm -f JS/Makefile.aqua.PL
-%{__sed} -i -e 's#\(NETSCAPE_\(INST\|CLASSES\|PLUGINS\)\) =>.*#\1 => "%{_plugindir}",#' vrml.conf*
+# avoid using included js
+rm -rf JS
+
+%{__sed} -i -e 's#\(NETSCAPE_\(INST\|CLASSES\|PLUGINS\)\) =>.*#\1 => "%{_browserpluginsdir}",#' vrml.conf*
 
 %build
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
+
 %{__make} -j1 \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}" \
-	OPTIMIZER="%{rpmcflags}" \
 	DESTINSTALLPRIVLIB=%{perl_vendorlib}
 
 %{__make} -C Plugin \
@@ -103,70 +95,53 @@ rm -f JS/Makefile.aqua.PL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_plugindir},%{perl_vendorlib}/VRML}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_browserpluginsdir},%{perl_vendorlib}/VRML}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	SITEARCHEXP=$RPM_BUILD_ROOT%{perl_vendorarch} \
 	DESTINSTALLPRIVLIB=$RPM_BUILD_ROOT%{perl_vendorlib} \
-	PLUGDIR=%{_plugindir}
+	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
 install java/classes/java.policy $RPM_BUILD_ROOT%{perl_vendorlib}/VRML
 
-# remove copy, make a symlink
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/VRML/VRMLFunc/libFreeWRLFunc.so
-ln -sf %{perl_vendorarch}/auto/VRML/VRMLFunc/VRMLFunc.so $RPM_BUILD_ROOT%{_libdir}/libFreeWRLFunc.so
-
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/VRML/fonts/{COPYRIGHT,README,RELEASENOTES}.TXT
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/{COPYRIGHT,README,RELEASENOTES}.TXT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerun -- mozilla-firefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins %{name}.so %{name}.xpi
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
-%triggerin -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins %{name}.so %{name}.xpi
+%post -n browser-plugin-%{name}
+%update_browser_plugins
 
-%triggerun -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins %{name}.so %{name}.xpi
-
-%triggerin -- konqueror
-%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror %{name}.so %{name}.xpi
-
-%triggerun -- konqueror
-%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror %{name}.so %{name}.xpi
-
-%triggerin -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins %{name}.so %{name}.xpi
-
-%triggerun -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins %{name}.so %{name}.xpi
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+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
-%attr(755,root,root) %{perl_vendorlib}/VRML/fw2init.pl
 %{perl_vendorlib}/VRML/java.policy
 %{perl_vendorlib}/VRML/vrml.jar
-%dir %{perl_vendorlib}/VRML/fonts
-# Bitstream Amerigo, BauerBodni, Futura fonts
-%{perl_vendorlib}/VRML/fonts/*.ttf
-%{perl_vendorarch}/VRML
-%dir %{perl_vendorarch}/auto/VRML
-%dir %{perl_vendorarch}/auto/VRML/*
-%{perl_vendorarch}/auto/VRML/*/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/VRML/*/*.so
-%{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/fonts
+%{_datadir}/%{name}/fonts/*.ttf
+%{_datadir}/%{name}/fonts/*.conf
+%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/%{name}.desktop
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_plugindir}/*.so
+%attr(755,root,root) %{_browserpluginsdir}/npfreewrl.so
+%{_browserpluginsdir}/vrml.jar