Author: qboosh Date: Sat Jan 12 19:26:42 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated config patch, restored system-js,optimize patches
---- Files affected: SPECS: freewrl.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/freewrl.spec diff -u SPECS/freewrl.spec:1.36 SPECS/freewrl.spec:1.37 --- SPECS/freewrl.spec:1.36 Mon Dec 3 02:18:49 2007 +++ SPECS/freewrl.spec Sat Jan 12 20:26:37 2008 @@ -1,8 +1,7 @@ # $Revision$, $Date$ # 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 @@ -11,22 +10,23 @@ Name: freewrl Version: 1.19.8 Release: 0.2 -License: LGPL +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.357 @@ -77,11 +77,12 @@ %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 @@ -91,7 +92,6 @@ %{__make} -j1 \ CC="%{__cc}" \ OPTIMIZE="%{rpmcflags}" \ - OPTIMIZER="%{rpmcflags}" \ DESTINSTALLPRIVLIB=%{perl_vendorlib} %{__make} -C Plugin \ @@ -106,7 +106,8 @@ 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 @@ -117,9 +118,8 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %post -n browser-plugin-%{name} %update_browser_plugins @@ -131,10 +131,11 @@ %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 @@ -147,8 +148,8 @@ %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 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -156,6 +157,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2008-01-12 19:26:37 qboosh +- updated config patch, restored system-js,optimize patches + Revision 1.36 2007-12-03 01:18:49 wolvverine - add %post/un ldconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freewrl.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
