Author: wolvverine Date: Sun Dec 2 23:41:46 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.19.8
---- Files affected: SPECS: freewrl.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/freewrl.spec diff -u SPECS/freewrl.spec:1.33 SPECS/freewrl.spec:1.34 --- SPECS/freewrl.spec:1.33 Tue Feb 13 08:16:44 2007 +++ SPECS/freewrl.spec Mon Dec 3 00:41:41 2007 @@ -6,36 +6,32 @@ %include /usr/lib/rpm/macros.perl %define pdir VRML %define pnam VRMLFunc -Summary: FreeWRL - VRML browser -Summary(pl.UTF-8): 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 +Version: 1.19.8 +Release: 0.1 License: LGPL 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 -Patch2: %{name}-system-js.patch -Patch3: %{name}-optimize.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: java-sun BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: mozilla-devel -BuildRequires: mozilla-embedded(gtk2) +BuildRequires: openmotif-devel BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.236 BuildRequires: saxon +BuildRequires: xorg-lib-libXaw-devel %ifarch %{x8664} ia64 ppc64 s390x sparc64 Provides: libFreeWRLFunc.so()(64-bit) %else @@ -44,7 +40,6 @@ Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION') 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 @@ -52,14 +47,14 @@ %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.UTF-8 -FreeWRL - przeglądarka VRML. +FreeWRL - przeglądarka VRM/X3D. %package -n browser-plugin-%{name} -Summary: VRML plugin for WWW browser -Summary(pl.UTF-8): 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}) @@ -69,12 +64,12 @@ Obsoletes: netscape-plugin-freewrl %description -n browser-plugin-%{name} -VRML plugin for Mozilla WWW browser. +VRML and X3D plugin for WWW browser. Supported browsers: %{browsers}. %description -n browser-plugin-%{name} -l pl.UTF-8 -Wtyczka VRML dla przeglądarki WWW Mozilla. +Wtyczka VRML i X3D dla przeglądarki WW. Obsługiwane przeglądarki: %{browsers}. @@ -82,16 +77,17 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 +#%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* +%{__sed} -i -e 's#\(NETSCAPE_\(INST\|CLASSES\|PLUGINS\)\) =>.*#\1 => "%{_browserpluginsdir}",#' vrml.conf* %build %{__perl} Makefile.PL \ INSTALLDIRS=vendor + %{__make} -j1 \ CC="%{__cc}" \ OPTIMIZE="%{rpmcflags}" \ @@ -104,47 +100,30 @@ %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} # 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 - -%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 +%post -n browser-plugin-%{name} +%update_browser_plugins -%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) @@ -152,25 +131,20 @@ %attr(755,root,root) %{_bindir}/* %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}/*.so +%attr(755,root,root) %{_browserpluginsdir}/vrml.jar %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -178,7 +152,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.33 2007-02-13 07:16:44 glen +Revision 1.34 2007-12-02 23:41:41 wolvverine +- up to 1.19.8 + +Revision 1.33 2007/02/13 07:16:44 glen - tabs in preamble Revision 1.32 2007/02/12 00:48:50 baggins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freewrl.spec?r1=1.33&r2=1.34&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
