rpms/bltk/devel bltk-1.0.8-all.patch, 1.1, 1.2 bltk.conf, 1.1, 1.2 bltk.spec, 1.1, 1.2
Jiri Skala
jskala at fedoraproject.org
Fri Apr 10 13:20:48 UTC 2009
Author: jskala
Update of /cvs/extras/rpms/bltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1063
Modified Files:
bltk-1.0.8-all.patch bltk.conf bltk.spec
Log Message:
* Fri Apr 10 2009 Jiri Skala <jskala at redhat.com> 1.0.8-2
- optimized bltk.conf - SOFFICE_PROG
- fixed working dir in reports
- fixed SIGHUP handling
- finalized implementation of stop file in office and reader WLs
bltk-1.0.8-all.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 bltk-1.0.8-all.patch
Index: bltk-1.0.8-all.patch
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk-1.0.8-all.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk-1.0.8-all.patch 4 Mar 2009 08:51:16 -0000 1.1
+++ bltk-1.0.8-all.patch 10 Apr 2009 13:20:47 -0000 1.2
@@ -1,465 +1,364 @@
---- bltk-1.0.8/wl_office/bltk_wl_office_install.sh 2006-05-03 14:17:44.000000000 +0200
-+++ bltk-1.0.9/wl_office/bltk_wl_office_install.sh 2009-02-04 17:08:00.000000000 +0100
-@@ -38,6 +38,7 @@
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #
-
-+. /etc/bltk.conf
-
- source `dirname $0`/../../bin/bltk_wl_common
- [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
-@@ -171,20 +172,25 @@
- wl_check_error $?
- }
-
--if [[ $# = 0 || $1 = i || $1 = install ]]
-+if [[ "$WL_OFFICE_ENABLED" = "YES" && "$WL_OFFICE_EXTERN" = "YES" ]]
- then
-- work=install
--elif [[ $1 = u || $1 = uninstall ]]
--then
-- work=uninstall
-+ if [[ $# = 0 || $1 = i || $1 = install ]]
-+ then
-+ work=install
-+ elif [[ $1 = u || $1 = uninstall ]]
-+ then
-+ work=uninstall
-+ else
-+ echo "Invalid parameter"
-+ exit 1
-+ fi
+--- orig/include/parseconf.h 1970-01-01 01:00:00.000000000 +0100
++++ curr/include/parseconf.h 2009-03-05 16:12:18.000000000 +0100
+@@ -0,0 +1,61 @@
++/*
++ * Copyright (c) 2009 Red Hat Inc.
++ * Copyright (c) 2009 Jiri Skala <jskala at redhat.com>
++ * All rights reserved.
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the following disclaimer.
++ *
++ * Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * Neither the name of Intel Corporation nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
++ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
++ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
++ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
+
-+ {
-+ startup
-+ $work
-+ cleanup 0
-+ } 2>&1 | tee -i $work.log
- else
-- echo "Invalid parameter"
-- exit 1
-+ exit 0
- fi
++#ifndef __PARSECONF_H__
++#define __PARSECONF_H__
++
++extern char *bltk_home;
++extern char *soffice_prog;
++extern char *wl_office_working_dir;
++extern char *bltk_player_prog;
++extern char *bltk_player_file;
++extern char *bltk_reader_prog;
++
++extern int wl_developer_enabled;
++extern int wl_developer_extern;
++extern int wl_game_enabled;
++extern int wl_game_extern;
++extern int wl_office_enabled;
++extern int wl_office_extern;
++extern int wl_player_enabled;
++extern int wl_player_extern;
++extern int wl_reader_enabled;
++extern int wl_reader_extern;
++
++#endif
++
+--- orig/include/xse.h 2007-02-25 08:24:29.000000000 +0100
++++ curr/include/xse.h 2009-03-05 16:12:18.000000000 +0100
+@@ -87,7 +87,8 @@
+ #define DELAY_1_MIN (1 * 60 * 1000)
+ #define DELAY_2_MIN (2 * 60 * 1000)
+ #define WINDOWID "WINDOWID"
+-#define DELAY_FILE "./user_delay.tmp"
++#define DELAY_FILE "user_delay.tmp"
++#define WINID_FILE "winid.tmp"
+ #define VI_CMD "vi"
+ #define CSCOPE_CMD "cscope"
+ #define F4 "F4"
+--- orig/wl_reader/bltk_wl_reader_xse.c 2007-02-25 08:24:29.000000000 +0100
++++ curr/wl_reader/bltk_wl_reader_xse.c 2009-04-10 14:45:08.000000000 +0200
+@@ -108,7 +108,7 @@
+ }
+ }
--{
--startup
--$work
--cleanup 0
--} 2>&1 | tee -i $work.log
--
---- bltk-1.0.8/wl_office/scen_install 2006-03-08 10:12:07.000000000 +0100
-+++ bltk-1.0.9/wl_office/scen_install 2009-02-12 13:19:34.000000000 +0100
-@@ -1,7 +1,7 @@
- ## Installation scenario
+- env = getenv("BLTK_WL_PROG");
++ env = getenv("BLTK_READER_PROG");
+ if (env && strcmp(env, "konqueror") == 0) {
+ scen[LINE_QUIT].string = "Q";
+ }
+--- orig/tools/xse/xse.c 2007-02-25 08:24:29.000000000 +0100
++++ curr/tools/xse/xse.c 2009-04-03 15:25:17.000000000 +0200
+@@ -52,16 +52,20 @@
+ #include <time.h>
+ #include <sys/wait.h>
+ #include <signal.h>
++#include <sys/prctl.h>
+
+ #include <xse.h>
+
+ char *progname = "xse";
+ char *xchg_buf = NULL;
+ char *scen_file = NULL;
++char *stop_name = "NULL";
+ int default_release_flg = 0;
+ int check_delay_time_flg = 0;
+ int correct_delay_time_flg = 0;
--RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.sxw
--SETWINDOW 0 0 0 OOWRITER_FILE.sxw
-+RUNCMD X 0 0 bltk_wl_office_run_app OOWRITER_FILE.odt
-+SETWINDOW 0 0 0 OOWRITER_FILE.odt
++char winid_tmp[STR_LEN];
++
+ long double user_delay = 0;
- SETWINDOW 0 0 0 OpenOffice.org Registration
- FOCUSIN 0 0 100 0
-@@ -20,7 +20,7 @@
- DELAY 0 0 2000 0
- ENDWINDOW 0 0 0 Paragraph Styles
+ static Display *display = NULL;
+@@ -412,8 +416,10 @@
+ char string[STR_LEN];
--SETWINDOW 0 0 0 OOWRITER_FILE.sxw
-+SETWINDOW 0 0 0 OOWRITER_FILE.odt
- FOCUSIN 0 0 100 0
+ if (fname == 0) {
+- fname = DELAY_FILE;
++ snprintf(string, STR_LEN, "%s/%s", getenv("BLTK_HOME"), DELAY_FILE);
++ fname = strdup(string);
+ }
++ fprintf(stderr, "user delay file: %s\n", fname);
- DELAY 0 0 2000 0
-@@ -30,7 +30,7 @@
- PRESSKEY 0 0 6000 Return
- DELAY 0 0 2000 0
+ fd = open(fname, O_RDWR | O_TRUNC | O_CREAT, 0666);
+ if (fd < 0) {
+@@ -504,8 +510,8 @@
+ int ret = 0;
[...3057 lines suppressed...]
-- rm -f ./user_delay.tmp
-+ rm -f $USER_DELAY_TMP
- if [[ $BLTK_WL_FILE != DEBUG && $BLTK_WL_FILE != DEBUG1 ]]
- then
- run_cscope_vi
- wl_check_error $?
- else
- sleep 1
-- echo 1.11 >./user_delay.tmp
-- wl_check_error $? "echo 0.11 >./user_delay.tmp failed"
-+ echo 1.11 > $USER_DELAY_TMP
-+ wl_check_error $? "echo 0.11 > $USER_DELAY_TMP failed"
- fi
+ PRESSKEY A 0 1000 e
+-PRESSKEY 0 9 150 Down
++PRESSKEY 0 0 150 e
+ DELAY 0 0 1000 0
+ PRESSKEY 0 0 500 Return
-- CMD="cat ./user_delay.tmp"
-+ CMD="cat $USER_DELAY_TMP"
- DELAY_TIME=`$CMD`
- wl_check_error $? "$CMD failed"
+@@ -201,7 +197,7 @@
-@@ -280,7 +283,15 @@
- exit $1
- }
+ ENDWINDOW 0 0 0 Duplicate
--startup
--run
--cleanup 0
-+if [ $WL_DEVELOPER_ENABLED = "YES" ]
-+then
-+ startup
-+ run
-+ cleanup 0
-+else
-+ TTY=`tty`
-+ echo "WARNING!!!" > $TTY 2>&1
-+ echo "The developer workload is disabled. See manual and use external package." > $TTY 2>&1
-+ exit 0
-+fi
+-SETWINDOW 0 0 0 OODRAW_FILE.sxd
++SETWINDOW 0 0 0 OODRAW_FILE.odg
---- bltk-1.0.8/wl_developer/Makefile 2006-03-13 07:47:25.000000000 +0100
-+++ bltk-1.0.9/wl_developer/Makefile 2009-02-25 11:36:45.000000000 +0100
-@@ -1,6 +1,6 @@
+ FOCUSIN 0 0 150 0
+ DELAY 0 0 2000 0
+@@ -224,7 +220,7 @@
+ DELAY 0 0 3000 0
- CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include
--LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lxse -L../lib
-+LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk
+ PRESSKEY A 0 1000 v
+-PRESSKEY 0 0 500 Return
++PRESSKEY 0 0 500 z
- BIN = bin
+ SETWINDOW 0 0 0 Zoom
-@@ -15,7 +15,7 @@
- SHFILES_SH = ${SHFILES:=.sh}
- SHTARGETS = $(SHFILES:%=$(BIN)/%)
+@@ -237,98 +233,20 @@
--EXTERN_DEPS = $(HIDERS) ../lib/libxse.so
-+EXTERN_DEPS = $(HIDERS) ../lib/libxse.so.0
+ ENDWINDOW 0 0 0 Zoom
+-SETWINDOW 0 0 0 OODRAW_FILE.sxd
++SETWINDOW 0 0 0 OODRAW_FILE.odg
- all : $(BIN) $(SUBDIRS) $(TARGET) $(SHTARGETS) FORCE
---- bltk-1.0.8/wl_developer/bltk_wl_developer_install.sh 2006-05-03 14:17:44.000000000 +0200
-+++ bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh 2009-02-04 17:08:00.000000000 +0100
-@@ -38,6 +38,7 @@
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #
+ FOCUSIN 0 0 150 0
+ DELAY 0 0 2000 0
+-PRESSKEY A 0 1000 i
+-PRESSKEY 0 8 150 Down
+-DELAY 0 0 1000 0
+-PRESSKEY 0 1 500 Return
+-
+-DELAY 0 0 3000 0
+-
+-TYPETEXT 0 0 150 Name
+-PRESSKEY 0 0 1000 Right
+-TYPETEXT 0 0 150 Workdays
+-PRESSKEY 0 0 1000 Right
+-TYPETEXT 0 0 150 Pay Rate
+-PRESSKEY 0 0 1000 Right
+-TYPETEXT 0 0 150 Salary
+-PRESSKEY 0 0 1000 Down
+-PRESSKEY 0 3 500 Left
+-
+-DELAY 0 0 3000 0
+-TYPETEXT 0 0 150 John
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 Jane
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 Sam
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 Sarah
+-PRESSKEY 0 0 1000 Right
+-PRESSKEY 0 3 500 Up
+-
+-DELAY 0 0 3000 0
+-TYPETEXT 0 0 150 12
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 20
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 15
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 10
+-PRESSKEY 0 0 1000 Right
+-PRESSKEY 0 3 500 Up
+-
+-DELAY 0 0 3000 0
+-TYPETEXT 0 0 150 25
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 20
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 25
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 150 40
+-PRESSKEY 0 0 1000 Right
+-PRESSKEY 0 3 500 Up
+-
+-DELAY 0 0 3000 0
+-TYPETEXT 0 0 300 =b2*c2
+-DELAY 0 0 1000 0
+-PRESSKEY 0 0 1000 Return
+-PRESSKEY 0 0 1000 Up
+-PRESSKEY C 0 1000 c
+-PRESSKEY 0 0 200 Down
+-PRESSKEY S 2 500 Down
+-PRESSKEY C 0 1000 v
+-
+-DELAY 0 0 3000 0
+-PRESSKEY 0 0 1000 Down
+-TYPETEXT 0 0 300 =sum(
+-PRESSKEY 0 0 500 Up
+-PRESSKEY S 3 500 Up
+-TYPETEXT 0 0 500 )
+-DELAY 0 0 1000 0
+-PRESSKEY 0 0 1000 Return
+-
+-DELAY 0 0 3000 0
+-PRESSKEY 0 0 1000 Left
+-PRESSKEY 0 0 1000 Up
+-TYPETEXT 0 0 150 Total Pays
+-
+-DELAY 0 0 3000 0
+-PRESSKEY 0 3 3000 Esc
-+. /etc/bltk.conf
+ PRESSKEY A 0 1000 f
+-PRESSKEY 0 4 150 Down
++PRESSKEY 0 0 150 s
+ DELAY 0 0 2000 0
+-PRESSKEY 0 0 5000 Return
- source `dirname $0`/../../bin/bltk_wl_common
- [[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
-@@ -139,9 +140,14 @@
- exit 1
- fi
+ PRESSKEY A 0 1000 f
+-PRESSKEY 0 16 150 Down
++PRESSKEY 0 0 150 x
+ DELAY 0 0 3000 0
+-PRESSKEY 0 0 5000 Return
--{
--startup
--$work
--cleanup 0
--} 2>&1 | tee -i $work.log
-+if [[ "$WL_DEVELOPER_ENABLED" = "YES" && "$WL_DEVELOPER_EXTERN" = "YES" ]]
-+then
-+ {
-+ startup
-+ $work
-+ cleanup 0
-+ } 2>&1 | tee -i $work.log
-+else
-+ exit 0
-+fi
+-ENDWINDOW 0 0 0 OODRAW_FILE.sxd
++ENDWINDOW 0 0 0 OODRAW_FILE.odg
+
+ WAITFINISHCMD 0 0 0 soffice.bin
Index: bltk.conf
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk.conf 4 Mar 2009 08:51:16 -0000 1.1
+++ bltk.conf 10 Apr 2009 13:20:48 -0000 1.2
@@ -36,7 +36,7 @@
WL_OFFICE_EXTERN=NO
# Path to OpenOffice binary
-SOFFICE_PROG=/usr/lib/openoffice.org3/program/soffice
+SOFFICE_PROG=ooffice
WL_OFFICE_WORKING_DIR=~/.bltk/wl_office
Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bltk.spec 4 Mar 2009 08:51:16 -0000 1.1
+++ bltk.spec 10 Apr 2009 13:20:48 -0000 1.2
@@ -1,6 +1,6 @@
Name: bltk
Version: 1.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The BLTK measures notebook battery life under any workload
Group: Applications/System
@@ -39,8 +39,9 @@
%patch0 -p1 -b .all
%build
+export CFLAGS="$RPM_OPT_FLAGS"
make
-# make %{?_smp_mflags}
+#make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -150,6 +151,7 @@
%{_libdir}/bltk/bin/bltk_hd_state
%{_libdir}/bltk/bin/bltk_install
+%{_libdir}/bltk/bin/bltk_func
%{_libdir}/bltk/bin/bltk_plot
%{_libdir}/bltk/bin/bltk_report
%{_libdir}/bltk/bin/bltk_report_check
@@ -192,5 +194,11 @@
%{_libdir}/bltk/wl_reader/war_and_peace.html
%changelog
+* Fri Apr 10 2009 Jiri Skala <jskala at redhat.com> 1.0.8-2
+- optimized bltk.conf - SOFFICE_PROG
+- fixed working dir in reports
+- fixed SIGHUP handling
+- finalized implementation of stop file in office and reader WLs
+
* Thu Jan 29 2009 Jiri Skala <jskala at redhat.com> 1.0.8-1
- assembling package
More information about the fedora-extras-commits
mailing list