SPECS: freewrl.spec - use browser plugins (no triggers as pkg wasn...

Wed Jun 7 21:46:59 CEST 2006

Author: glen                         Date: Wed Jun  7 19:46:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use browser plugins (no triggers as pkg wasn't on ftp), added seamonkey
- pdir/pnam macros for perl cleanup automatics

---- Files affected:
SPECS:
   freewrl.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/freewrl.spec
diff -u SPECS/freewrl.spec:1.30 SPECS/freewrl.spec:1.31

--- SPECS/freewrl.spec:1.30	Wed Jun  7 12:36:42 2006
+++ SPECS/freewrl.spec	Wed Jun  7 21:46:54 2006
@@ -1,10 +1,11 @@
 # $Revision$, $Date$
 # TODO:
 # - install fonts system-wide (subpackage?)
-# - why not having the plugin in single dir, /usr/lib/nsplugins, and
-#   all the browsers symlink there?
+# - CC not always honoured
 # - ?? add more to optimize.patch
 %include	/usr/lib/rpm/macros.perl
+%define		pdir	VRML
+%define		pnam	VRMLFunc
 Summary:	FreeWRL - VRML browser
 Summary(pl):	FreeWRL - przeglądarka VRML
 Name:		freewrl
@@ -33,7 +34,7 @@
 BuildRequires:	mozilla-embedded(gtk2)
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.236
 BuildRequires:	saxon
 %ifarch %{x8664} ia64 ppc64 s390x sparc64
 Provides:	libFreeWRLFunc.so()(64-bit)
@@ -43,8 +44,8 @@
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		mozilladir	/usr/%{_lib}/mozilla
-%define		netscapedir	/usr/%{_lib}/netscape
+%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
@@ -56,59 +57,29 @@
 %description -l pl
 FreeWRL - przeglądarka VRML.
 
-%package -n mozilla-plugin-%{name}
-Summary:	VRML plugin for Mozilla WWW browser
-Summary(pl):	Wtyczka VRML dla przeglądarki WWW Mozilla
+%package -n browser-plugin-%{name}
+Summary:	VRML plugin for WWW browser
+Summary(pl):	Wtyczka VRML dla przeglądarki WWW
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	mozilla-embedded(gtk2)
+Requires:	browser-plugins(%{_target_base_arch})
+Obsoletes:	konqueror-plugin-freewrl
+Obsoletes:	mozilla-firefox-plugin-freewrl
+Obsoletes:	mozilla-plugin-freewrl
+Obsoletes:	netscape-plugin-freewrl
 
-%description -n mozilla-plugin-%{name}
+%description -n browser-plugin-%{name}
 VRML plugin for Mozilla WWW browser.
 
-%description -n mozilla-plugin-%{name} -l pl
-Wtyczka VRML dla przeglądarki WWW Mozilla.
-
-%package -n netscape-plugin-%{name}
-Summary:	VRML plugin for Netscape WWW browser
-Summary(pl):	Wtyczka VRML dla przeglądarki WWW Netscape
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description -n netscape-plugin-%{name}
-VRML plugin for Netscape WWW browser.
-
-%description -n netscape-plugin-%{name} -l pl
-Wtyczka VRML dla przeglądarki WWW Netscape.
-
-%package -n mozilla-firefox-plugin-%{name}
-Summary:	VRML plugin for Mozilla Firefox browser
-Summary(pl):	Wtyczka VRML dla przeglądarki Mozilla Firefox
-Group:		Libraries
-PreReq:		mozilla-firefox
-Requires:	%{name} = %{version}-%{release}
-
-%description -n mozilla-firefox-plugin-%{name}
-VRML plugin for Mozilla Firefox browser.
-
-%description -n mozilla-firefox-plugin-%{name} -l pl
-Wtyczka VRML dla przeglądarki Mozilla Firefox.
-
-%package -n konqueror-plugin-%{name}
-Summary:	VRML plugin for Konqueror browser
-Summary(pl):	Wtyczka VRML dla przeglądarki Konqueror
-Group:		Libraries
-PreReq:		konqueror >= 3.0.8-2.3
-Requires:	%{name} = %{version}-%{release}
+Supported browsers: %{browsers}.
 
-%description -n konqueror-plugin-%{name}
-VRML plugin for Konqueror browser.
+%description -n browser-plugin-%{name} -l pl
+Wtyczka VRML dla przeglądarki WWW Mozilla.
 
-%description -n konqueror-plugin-%{name} -l pl
-Wtyczka VRML dla przeglądarki Konqueror.
+Obsługiwane przeglądarki: %{browsers}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -116,11 +87,12 @@
 
 # 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*
 
 %build
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
-%{__make} \
+%{__make} -j1 \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}" \
 	OPTIMIZER="%{rpmcflags}" \
@@ -132,20 +104,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{mozilladir}/plugins,%{netscapedir}/plugins} \
-	$RPM_BUILD_ROOT%{_libdir}/{mozilla-firefox/plugins,kde3/plugins/konqueror} \
-	$RPM_BUILD_ROOT%{perl_vendorlib}/VRML \
-	$RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_plugindir},%{perl_vendorlib}/VRML}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	SITEARCHEXP=$RPM_BUILD_ROOT%{perl_vendorarch} \
-	DESTINSTALLPRIVLIB=$RPM_BUILD_ROOT%{perl_vendorlib}
-
-# mozilla plugin is installed by make install
-install Plugin/npfreewrl.so $RPM_BUILD_ROOT%{netscapedir}/plugins
-install Plugin/npfreewrl.so $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins
-install Plugin/npfreewrl.so $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror
+	DESTINSTALLPRIVLIB=$RPM_BUILD_ROOT%{perl_vendorlib} \
+	PLUGDIR=%{_plugindir}
 
 # specified in java/classes/Makefile.PL, but finally not installed
 install java/classes/vrml.jar $RPM_BUILD_ROOT%{perl_vendorlib}/VRML
@@ -155,9 +120,32 @@
 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerun -- mozilla-firefox
+%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins %{name}.so %{name}.xpi
+
+%triggerin -- mozilla
+%nsplugin_install -d %{_libdir}/mozilla/plugins %{name}.so %{name}.xpi
+
+%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
+
 %files
 %defattr(644,root,root,755)
 %doc README.html
@@ -180,21 +168,9 @@
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
-%files -n mozilla-plugin-%{name}
+%files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{mozilladir}/plugins/*.so
-
-%files -n netscape-plugin-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{netscapedir}/plugins/*.so
-
-%files -n mozilla-firefox-plugin-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/*.so
-
-%files -n konqueror-plugin-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/plugins/konqueror/*.so
+%attr(755,root,root) %{_plugindir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -202,6 +178,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/06/07 19:46:54  glen
+- use browser plugins (no triggers as pkg wasn't on ftp), added seamonkey
+- pdir/pnam macros for perl cleanup automatics
+
 Revision 1.30  2006/06/07 10:36:42  wolvverine
 - change patch1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/freewrl.spec?r1=1.30&r2=1.31&f=u

