Author: glen                         Date: Tue Jul  3 19:34:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added sysconfig file
- avoid installing ~/flixengine initscript
- create install.log similar to theirs

---- Files affected:
SPECS:
   flixengine.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/flixengine.spec
diff -u SPECS/flixengine.spec:1.45 SPECS/flixengine.spec:1.46
--- SPECS/flixengine.spec:1.45  Tue Jul  3 14:25:41 2007
+++ SPECS/flixengine.spec       Tue Jul  3 21:34:47 2007
@@ -19,7 +19,7 @@
 Summary(pl.UTF-8):     Silnik On2 Flix
 Name:          flixengine
 Version:       8.0.9.0
-Release:       1
+Release:       1.2
 License:       (probably) not distributable
 Group:         Applications
 # download demo from http://flix.on2.com/demos/
@@ -37,6 +37,7 @@
 NoSource:      1
 %endif
 Source2:       %{name}.init
+Source3:       flixengine.sysconfig
 Patch0:                %{name}-libdir.patch
 Patch1:                %{name}-phploader.patch
 URL:           http://www.on2.com/developer/flix-engine-sdk
@@ -215,7 +216,28 @@
 cd .flix-engine-installation-files
 
 export -f getinput inset ynanswer
-./install.sh "$@"
+instlog=install.log
+./install.sh "$@" | tee -i $instlog
+if [ -f "$instlog" ]; then
+       echo "Local system info:" >>$instlog
+       uname -a 2>/dev/null >>$instlog
+       head /etc/*version* 2>/dev/null >>$instlog
+       head /etc/*release* 2>/dev/null >>$instlog
+       cat /proc/cpuinfo 2>/dev/null >>$instlog
+       /lib/ld-linux.so.2 /lib/libc.so.6 2>/dev/null >>$instlog
+       echo "---" 2>/dev/null >>$instlog
+       /lib/ld-linux.so.2 /lib32/libc.so.6 2>/dev/null >>$instlog
+       echo "---" 2>/dev/null >>$instlog
+       /lib/libc.so.6 2>/dev/null >>$instlog
+       echo "---" 2>/dev/null >>$instlog
+       file /lib/libc.so.6 2>/dev/null >>$instlog
+       echo "---" 2>/dev/null >>$instlog
+       /sbin/ifconfig -a 2>/dev/null >>$instlog
+
+       echo "A log of this installation can be found here:"
+       echo "  $instlog"
+       echo
+fi
 EOF
 chmod +x install.sh
 
@@ -287,6 +309,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 ./install.sh \
        --prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -303,7 +326,9 @@
        --no-init \
        --noprereqlibs
 
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/flixd
+rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/flixengine
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/flixd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/flixd
 
 cd .flix-engine-installation-files
 install lget on2_host_info $RPM_BUILD_ROOT%{_sbindir}
@@ -466,6 +491,7 @@
 %attr(755,root,root) %{_sbindir}/lget
 %attr(755,root,root) %{_sbindir}/on2_host_info
 %attr(754,root,root) /etc/rc.d/init.d/flixd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/flixd
 
 %{_mandir}/man8/flixd.8*
 %dir %attr(771,root,flixd) /var/run/flixd
@@ -497,6 +523,7 @@
 %files -n java-flixengine
 %defattr(644,root,root,755)
 %doc %{_docdir}/on2/flixengine/javadoc
+# perhaps it should be 
/usr/lib/jvm/java-sun-1.6.0/jre/lib/i386/libflixengine2_jni.so ?
 %attr(755,root,root) %{_libdir}/libflixengine2_jni.so
 %{_javadir}/flixengine2.jar
 %{_examplesdir}/%{name}-%{version}/java
@@ -538,6 +565,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/07/03 19:34:47  glen
+- added sysconfig file
+- avoid installing ~/flixengine initscript
+- create install.log similar to theirs
+
 Revision 1.45  2007/07/03 12:25:41  glen
 - update to 8.0.9.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.45&r2=1.46&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to