[bltk] New version
Jaroslav Škarvada
jskarvad at fedoraproject.org
Thu Mar 29 15:08:43 UTC 2012
commit 3c0c0c1c538d439f6fd21a687a85176b6f51cd44
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Thu Mar 29 17:08:38 2012 +0200
New version
- Dropped office_scen patch (upstreamed)
- Dropped hdparm patch (upstream added support for LVM)
- Reworked rm_sudo patch
.gitignore | 2 +-
bltk-1.0.9-hdparm.patch | 19 --
bltk-1.0.9-office_scen.patch | 85 --------
..._install.patch => bltk-1.1.0-cond_install.patch | 22 ++-
...1.0.9-rm_sudo.patch => bltk-1.1.0-rm_sudo.patch | 202 +++++++++++---------
bltk.spec | 22 ++-
sources | 2 +-
7 files changed, 142 insertions(+), 212 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37e9a07..c76e1e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-bltk-1.0.9.tar.gz
+bltk-*.tar.gz
diff --git a/bltk-1.0.9-cond_install.patch b/bltk-1.1.0-cond_install.patch
similarity index 94%
rename from bltk-1.0.9-cond_install.patch
rename to bltk-1.1.0-cond_install.patch
index 920b687..4f72f50 100644
--- a/bltk-1.0.9-cond_install.patch
+++ b/bltk-1.1.0-cond_install.patch
@@ -33,14 +33,15 @@ diff -up bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh.cond_install bltk-
diff -up bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install bltk-1.0.9/wl_office/bltk_wl_office_install.sh
--- bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install 2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/wl_office/bltk_wl_office_install.sh 2009-07-29 15:00:59.406496688 +0200
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,8 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
-
++
source `dirname $0`/../../bin/bltk_wl_common
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
+
@@ -80,7 +81,6 @@ cleanup()
install_ooo()
@@ -49,20 +50,26 @@ diff -up bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install bltk-1.0.9/
wl_remove_file ${HOME}/.sversionrc
wl_check_error $?
-@@ -162,20 +162,25 @@ uninstall()
+@@ -188,23 +188,27 @@
}
-if [[ $# = 0 || $1 = i || $1 = install ]]
--then
-- work=install
--elif [[ $1 = u || $1 = uninstall ]]
+if [[ "$WL_OFFICE_ENABLED" = "YES" && "$WL_OFFICE_EXTERN" = "YES" ]]
then
+- work=install
+-elif [[ $1 = install-loc ]]
+-then
+- work=install-loc
+-elif [[ $1 = u || $1 = uninstall ]]
+-then
- work=uninstall
+ if [[ $# = 0 || $1 = i || $1 = install ]]
+ then
+ work=install
++ elif [[ $1 = install-loc ]]
++ then
++ work=install-loc
+ elif [[ $1 = u || $1 = uninstall ]]
+ then
+ work=uninstall
@@ -81,14 +88,13 @@ diff -up bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install bltk-1.0.9/
- exit 1
+ exit 0
fi
-
+-
-{
-startup
-$work
-cleanup 0
-} 2>&1 | tee -i $work.log
-
-diff -up bltk-1.0.9/wl_player/bltk_wl_player_install.sh.cond_install bltk-1.0.9/wl_player/bltk_wl_player_install.sh
--- bltk-1.0.9/wl_player/bltk_wl_player_install.sh.cond_install 2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/wl_player/bltk_wl_player_install.sh 2009-07-29 15:06:43.249585854 +0200
@@ -41,6 +41,8 @@
diff --git a/bltk-1.0.9-rm_sudo.patch b/bltk-1.1.0-rm_sudo.patch
similarity index 72%
rename from bltk-1.0.9-rm_sudo.patch
rename to bltk-1.1.0-rm_sudo.patch
index 641879f..ed81034 100644
--- a/bltk-1.0.9-rm_sudo.patch
+++ b/bltk-1.1.0-rm_sudo.patch
@@ -1,6 +1,6 @@
-diff -up bltk-1.0.9/include/bltk.h.sec_sudo bltk-1.0.9/include/bltk.h
---- bltk-1.0.9/include/bltk.h.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/include/bltk.h 2009-12-08 14:28:23.868162165 +0100
+diff -up bltk-1.1.0/include/bltk.h.sec_sudo bltk-1.1.0/include/bltk.h
+--- bltk-1.1.0/include/bltk.h.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/include/bltk.h 2009-12-08 14:28:23.868162165 +0100
@@ -429,8 +429,6 @@ extern int dpms_proc_flg;
extern char *results;
@@ -10,9 +10,9 @@ diff -up bltk-1.0.9/include/bltk.h.sec_sudo bltk-1.0.9/include/bltk.h
extern int abort_flg;
extern int ac_ignore;
-diff -up bltk-1.0.9/Makefile.sec_sudo bltk-1.0.9/Makefile
---- bltk-1.0.9/Makefile.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/Makefile 2009-12-08 14:28:23.868162165 +0100
+diff -up bltk-1.1.0/Makefile.sec_sudo bltk-1.1.0/Makefile
+--- bltk-1.1.0/Makefile.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/Makefile 2009-12-08 14:28:23.868162165 +0100
@@ -89,10 +89,6 @@ clean : FORCE
@$(RM) *~ last_cmd last_results history
@$(RM) .bltk install.log uninstall.log .plot_history
@@ -24,10 +24,10 @@ diff -up bltk-1.0.9/Makefile.sec_sudo bltk-1.0.9/Makefile
_lazy : FORCE
@for f in $(CMDS); \
do \
-diff -up bltk-1.0.9/tools/analyzer/bltk_report.sh.sec_sudo bltk-1.0.9/tools/analyzer/bltk_report.sh
-diff -up bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo bltk-1.0.9/tools/bat_drain/bat_drain.sh
---- bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/tools/bat_drain/bat_drain.sh 2009-12-10 13:55:46.454371019 +0100
+diff -up bltk-1.1.0/tools/analyzer/bltk_report.sh.sec_sudo bltk-1.1.0/tools/analyzer/bltk_report.sh
+diff -up bltk-1.1.0/tools/bat_drain/bat_drain.sh.sec_sudo bltk-1.1.0/tools/bat_drain/bat_drain.sh
+--- bltk-1.1.0/tools/bat_drain/bat_drain.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/tools/bat_drain/bat_drain.sh 2009-12-10 13:55:46.454371019 +0100
@@ -100,16 +100,12 @@ set_bltk_root()
set_bltk_root
@@ -65,9 +65,9 @@ diff -up bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo bltk-1.0.9/tools/bat_d
init_srgs "$@"
if [[ $left_work_flg = TRUE ]]
-diff -up bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_check.sh
---- bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo 2009-12-08 14:28:23.846162271 +0100
-+++ bltk-1.0.9/tools/bltk/bltk_check.sh 2009-12-08 14:28:23.876162742 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_check.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_check.sh
+--- bltk-1.1.0/tools/bltk/bltk_check.sh.sec_sudo 2009-12-08 14:28:23.846162271 +0100
++++ bltk-1.1.0/tools/bltk/bltk_check.sh 2009-12-08 14:28:23.876162742 +0100
@@ -85,14 +85,6 @@ command_line()
cmd_startup
[[ $? != 0 ]] && exit 1
@@ -83,9 +83,9 @@ diff -up bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk
command_line "$@"
#rm -rf $RES
-diff -up bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh
---- bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo 2009-12-08 14:28:23.825191233 +0100
-+++ bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh 2009-12-08 14:28:23.877162125 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_get_dmidecode.sh
+--- bltk-1.1.0/tools/bltk/bltk_get_dmidecode.sh.sec_sudo 2009-12-08 14:28:23.825191233 +0100
++++ bltk-1.1.0/tools/bltk/bltk_get_dmidecode.sh 2009-12-08 14:28:23.877162125 +0100
@@ -74,65 +74,13 @@ command_line()
done
@@ -161,26 +161,37 @@ diff -up bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.0.9/tools/b
-rm -f $TMP_FILE
-
exit 0
-diff -up bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh
---- bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo 2009-12-08 14:28:23.817162439 +0100
-+++ bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh 2009-12-10 15:55:25.035367622 +0100
-@@ -56,7 +56,12 @@ warning()
+diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh
+--- bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.orig 2010-08-18 08:35:02.000000000 +0200
++++ bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh 2012-03-29 16:52:11.881359552 +0200
+@@ -55,7 +55,12 @@
PARTITIONS=$1
+FOUND=0
+READING=0
- TMP_FILE=$BLTK_HOME/tmp/hdparm
+ TMP_FILE=$BLTK_ROOT/tmp/hdparm
+DEV_INFO=$BLTK_HOME/tmp/dev_info
+
+/usr/bin/devkit-disks --dump > $TMP_FILE
- str=`ls -d /sys/block/sd* | sed 's/^.*sd/sd/'`
- DF_NAME=${str%% *}
-@@ -70,30 +75,40 @@ fi
-
- HD_DEV_NAME=/dev/$HD_NAME
+ #str=`df -lk / | grep -v ^Filesystem`
+ str=`df -lk / | grep ^/dev/`
+@@ -64,15 +69,35 @@
+ realname="`readlink $DF_DEV_NAME`"
+ DF_NAME="`basename ${realname}`"
+ HD_NAME=${DF_NAME}
+- DISK_CK_TOOL="lvdisplay -a"
+- HD_DEV_NAME=$DF_DEV_NAME
+ else
+ DF_NAME=${DF_DEV_NAME#/dev/}
+ HD_NAME=${DF_NAME%%[0-9]*}
+- DISK_CK_TOOL="hdparm -iI"
+- HD_DEV_NAME=/dev/$HD_NAME
+ fi
++HD_DEV_NAME=/dev/$HD_NAME
++
+while read line
+do
+ if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then
@@ -194,49 +205,64 @@ diff -up bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.0.9/tools/bltk
+ fi
+ fi
+
-+ if [[ $READING -eq 1 ]]; then
++ if [[ $READING -eq 1 ]]; then
+ echo $line >> $DEV_INFO
+ fi
+
-+ if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then
++ if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then
+ FOUND=1
+ fi
+done < $TMP_FILE
+
- rm -f $TMP_FILE
--$BLTK_SUDO_CMD hdparm -iI "$HD_DEV_NAME" >$TMP_FILE 2>&1
-
- echo "DF_NAME = $DF_NAME"
- echo "DF_DEV_NAME = $DF_DEV_NAME"
- echo "HD_NAME = $HD_NAME"
+ grep -w "$HD_NAME" "$PARTITIONS" >/dev/null 2>&1
+ if [[ $? != 0 ]]
+ then
+@@ -85,34 +110,17 @@
echo "HD_DEV_NAME = $HD_DEV_NAME"
--str=`grep '^ Model=' $TMP_FILE`
--str=${str# Model=}
--str=${str%%, *}
--if [[ -z "$str" ]]
--then
-- str=`grep '^ Model Number:' $TMP_FILE`
-- str=${str#*Model Number:}
+ rm -f $TMP_FILE
+-BLTK_SUDO_CMD=sudo
+-$BLTK_SUDO_CMD $DISK_CK_TOOL "$HD_DEV_NAME" >$TMP_FILE 2>&1
+-if [ -L $DF_DEV_NAME ];then
++if [ -L $DF_DEV_NAME ];then
+ echo "HD_MODEL = Logical volume"
+
+- str=`grep 'LV Size' $TMP_FILE`
+- str=${str#*LV Size*}
- str=`echo $str`
--fi
--echo "HD_MODEL = $str"
-+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
-
--str=`grep 'device size with M = 1000' $TMP_FILE`
--str=${str#*device size with M = 1000*:}
--str=`echo $str`
--echo "HD_SIZE = $str"
-+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
-+echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
+- echo "HD_SIZE = $str"
+-else
+-
+- str=`grep '^ Model=' $TMP_FILE`
+- str=${str# Model=}
+- str=${str%%, *}
+- if [[ -z "$str" ]]
+- then
+- str=`grep '^ Model Number:' $TMP_FILE`
+- str=${str#*Model Number:}
+- str=`echo $str`
+- fi
+- echo "HD_MODEL = $str"
+-
+- str=`grep 'device size with M = 1000' $TMP_FILE`
+- str=${str#*device size with M = 1000*:}
+- str=`echo $str`
+- echo "HD_SIZE = $str"
++ str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
++ echo "HD_SIZE = $((str/1048576)) MBytes ($((str/1073741824)) GB)"
++else
++ echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
++ str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
++ echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
+ fi
-rm -f $TMP_FILE
-+rm $DEV_INFO
++rm -f $DEV_INFO
exit 0
-diff -up bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_user_field.sh
---- bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo 2009-12-08 14:28:23.826177205 +0100
-+++ bltk-1.0.9/tools/bltk/bltk_get_user_field.sh 2009-12-10 15:58:45.697370853 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_get_user_field.sh
+--- bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo 2009-12-08 14:28:23.826177205 +0100
++++ bltk-1.1.0/tools/bltk/bltk_get_user_field.sh 2009-12-10 15:58:45.697370853 +0100
@@ -57,7 +57,12 @@ warning()
FIELD_NO=$1
DELIM=$1
@@ -307,10 +333,10 @@ diff -up bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.0.9/tools/
+rm $DEV_INFO
exit 0
-diff -up bltk-1.0.9/tools/bltk/bltk_hd_state.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_hd_state.sh
-diff -up bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_install.sh
---- bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/tools/bltk/bltk_install.sh 2009-12-08 14:28:23.879167455 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_hd_state.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_hd_state.sh
+diff -up bltk-1.1.0/tools/bltk/bltk_install.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_install.sh
+--- bltk-1.1.0/tools/bltk/bltk_install.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/tools/bltk/bltk_install.sh 2009-12-08 14:28:23.879167455 +0100
@@ -100,18 +100,6 @@ done
cd $BLTK_ROOT
[[ $? != 0 ]] && exit 1
@@ -330,9 +356,9 @@ diff -up bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo bltk-1.0.9/tools/bltk/bl
CWD=$PWD
for work in $WORK
-diff -up bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh
---- bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh 2009-12-08 14:28:23.880163066 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_save_sys_info.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_save_sys_info.sh
+--- bltk-1.1.0/tools/bltk/bltk_save_sys_info.sh.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/tools/bltk/bltk_save_sys_info.sh 2009-12-08 14:28:23.880163066 +0100
@@ -48,13 +48,6 @@ group=`id -gn`
trap 'trap_action 1; exit 1' 1 2 3 6 15
@@ -398,9 +424,9 @@ diff -up bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo bltk-1.0.9/tools/b
-
exit 0
-diff -up bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_wl_common.sh
---- bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo 2009-12-08 14:28:23.847162491 +0100
-+++ bltk-1.0.9/tools/bltk/bltk_wl_common.sh 2009-12-08 14:28:23.881171389 +0100
+diff -up bltk-1.1.0/tools/bltk/bltk_wl_common.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_wl_common.sh
+--- bltk-1.1.0/tools/bltk/bltk_wl_common.sh.sec_sudo 2009-12-08 14:28:23.847162491 +0100
++++ bltk-1.1.0/tools/bltk/bltk_wl_common.sh 2009-12-08 14:28:23.881171389 +0100
@@ -133,7 +133,6 @@ cmd_startup()
export BLTK_LIB=$BLTK_ROOT/lib
export BLTK_TMP=$HOME/.bltk/tmp
@@ -445,9 +471,9 @@ diff -up bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo bltk-1.0.9/tools/bltk/
wl_move_dir()
{
typeset dir1=$1
-diff -up bltk-1.0.9/tools/bltk/main.c.sec_sudo bltk-1.0.9/tools/bltk/main.c
---- bltk-1.0.9/tools/bltk/main.c.sec_sudo 2009-12-08 14:28:23.852162407 +0100
-+++ bltk-1.0.9/tools/bltk/main.c 2009-12-08 14:28:23.883191456 +0100
+diff -up bltk-1.1.0/tools/bltk/main.c.sec_sudo bltk-1.1.0/tools/bltk/main.c
+--- bltk-1.1.0/tools/bltk/main.c.sec_sudo 2009-12-08 14:28:23.852162407 +0100
++++ bltk-1.1.0/tools/bltk/main.c 2009-12-08 14:28:23.883191456 +0100
@@ -215,8 +215,6 @@ int stat_system = 0;
int comment_cnt = 0;
char *comment[MAX_LINES];
@@ -542,9 +568,9 @@ diff -up bltk-1.0.9/tools/bltk/main.c.sec_sudo bltk-1.0.9/tools/bltk/main.c
(void)sprintf(prt_str, "Start prog %s\n", cmd);
write_to_stdout_work_out_log(prt_str);
ret = prog_system(cmd);
-diff -up bltk-1.0.9/tools/bltk/Makefile.sec_sudo bltk-1.0.9/tools/bltk/Makefile
---- bltk-1.0.9/tools/bltk/Makefile.sec_sudo 2009-12-08 14:28:23.806162596 +0100
-+++ bltk-1.0.9/tools/bltk/Makefile 2009-12-08 14:28:23.875173697 +0100
+diff -up bltk-1.1.0/tools/bltk/Makefile.sec_sudo bltk-1.1.0/tools/bltk/Makefile
+--- bltk-1.1.0/tools/bltk/Makefile.sec_sudo 2009-12-08 14:28:23.806162596 +0100
++++ bltk-1.1.0/tools/bltk/Makefile 2009-12-08 14:28:23.875173697 +0100
@@ -14,7 +14,7 @@ HIDERS = ../../include/bltk.h ../../inc
TARGETS = $(BIN)/bltk
@@ -554,9 +580,9 @@ diff -up bltk-1.0.9/tools/bltk/Makefile.sec_sudo bltk-1.0.9/tools/bltk/Makefile
bltk_get_ac_adapter bltk_get_bat bltk_get_cpustat \
bltk_get_cpufreq bltk_get_cpuinfo bltk_get_cpustate \
bltk_get_dmidecode bltk_get_hdparm \
-diff -up bltk-1.0.9/tools/bltk/stat.c.sec_sudo bltk-1.0.9/tools/bltk/stat.c
---- bltk-1.0.9/tools/bltk/stat.c.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/tools/bltk/stat.c 2009-12-08 14:28:23.886191838 +0100
+diff -up bltk-1.1.0/tools/bltk/stat.c.sec_sudo bltk-1.1.0/tools/bltk/stat.c
+--- bltk-1.1.0/tools/bltk/stat.c.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/tools/bltk/stat.c 2009-12-08 14:28:23.886191838 +0100
@@ -205,24 +205,6 @@ void turn_off_stat_memory(void)
}
}
@@ -634,9 +660,9 @@ diff -up bltk-1.0.9/tools/bltk/stat.c.sec_sudo bltk-1.0.9/tools/bltk/stat.c
if (hd_stat_rd_wr_ignore == 0) {
get_hd_stat(1, &c_hd_stat);
-diff -up bltk-1.0.9/tools/Makefile.sec_sudo bltk-1.0.9/tools/Makefile
---- bltk-1.0.9/tools/Makefile.sec_sudo 2009-07-29 11:38:48.000000000 +0200
-+++ bltk-1.0.9/tools/Makefile 2009-12-08 14:28:23.869162456 +0100
+diff -up bltk-1.1.0/tools/Makefile.sec_sudo bltk-1.1.0/tools/Makefile
+--- bltk-1.1.0/tools/Makefile.sec_sudo 2009-07-29 11:38:48.000000000 +0200
++++ bltk-1.1.0/tools/Makefile 2009-12-08 14:28:23.869162456 +0100
@@ -1,5 +1,5 @@
-SUBDIRS = xse bltk sudo get_realpath type_command analyzer time bat_drain
@@ -653,11 +679,11 @@ diff -up bltk-1.0.9/tools/Makefile.sec_sudo bltk-1.0.9/tools/Makefile
-
FORCE :
-diff -up bltk-1.0.9/tools/sudo/bltk_sudo.c.sec_sudo bltk-1.0.9/tools/sudo/bltk_sudo.c
-diff -up bltk-1.0.9/tools/sudo/Makefile.sec_sudo bltk-1.0.9/tools/sudo/Makefile
-diff -up bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo bltk-1.0.9/wl_game/bltk_wl_game.sh
---- bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo 2009-12-08 14:28:23.797167456 +0100
-+++ bltk-1.0.9/wl_game/bltk_wl_game.sh 2009-12-08 14:28:23.887196668 +0100
+diff -up bltk-1.1.0/tools/sudo/bltk_sudo.c.sec_sudo bltk-1.1.0/tools/sudo/bltk_sudo.c
+diff -up bltk-1.1.0/tools/sudo/Makefile.sec_sudo bltk-1.1.0/tools/sudo/Makefile
+diff -up bltk-1.1.0/wl_game/bltk_wl_game.sh.sec_sudo bltk-1.1.0/wl_game/bltk_wl_game.sh
+--- bltk-1.1.0/wl_game/bltk_wl_game.sh.sec_sudo 2009-12-08 14:28:23.797167456 +0100
++++ bltk-1.1.0/wl_game/bltk_wl_game.sh 2009-12-08 14:28:23.887196668 +0100
@@ -81,7 +81,7 @@ clean_gmhome()
{
if [[ -d $GMHOME ]]
@@ -667,9 +693,9 @@ diff -up bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo bltk-1.0.9/wl_game/bltk_wl_
$CMD
wl_check_error $? "$CMD failed"
fi
-diff -up bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo bltk-1.0.9/wl_player/bltk_wl_player.sh
---- bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo 2009-12-08 14:28:23.821177150 +0100
-+++ bltk-1.0.9/wl_player/bltk_wl_player.sh 2009-12-08 14:28:23.888191092 +0100
+diff -up bltk-1.1.0/wl_player/bltk_wl_player.sh.sec_sudo bltk-1.1.0/wl_player/bltk_wl_player.sh
+--- bltk-1.1.0/wl_player/bltk_wl_player.sh.sec_sudo 2009-12-08 14:28:23.821177150 +0100
++++ bltk-1.1.0/wl_player/bltk_wl_player.sh 2009-12-08 14:28:23.888191092 +0100
@@ -95,27 +95,6 @@ startup()
### env | sort >env.log
}
@@ -698,9 +724,9 @@ diff -up bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo bltk-1.0.9/wl_player/bl
run1()
{
ST_TIME=`$BLTK_TIME_CMD`
-diff -up bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo bltk-1.0.9/wl_reader/bltk_wl_reader.sh
---- bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo 2009-12-08 14:28:23.841162495 +0100
-+++ bltk-1.0.9/wl_reader/bltk_wl_reader.sh 2009-12-08 14:28:23.889162188 +0100
+diff -up bltk-1.1.0/wl_reader/bltk_wl_reader.sh.sec_sudo bltk-1.1.0/wl_reader/bltk_wl_reader.sh
+--- bltk-1.1.0/wl_reader/bltk_wl_reader.sh.sec_sudo 2009-12-08 14:28:23.841162495 +0100
++++ bltk-1.1.0/wl_reader/bltk_wl_reader.sh 2009-12-08 14:28:23.889162188 +0100
@@ -103,7 +103,7 @@ startup()
fi
if [[ $default_flg = TRUE ]]
diff --git a/bltk.spec b/bltk.spec
index 15c4092..c7a62dc 100644
--- a/bltk.spec
+++ b/bltk.spec
@@ -1,11 +1,11 @@
Name: bltk
-Version: 1.0.9
-Release: 12%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: The BLTK measures notebook battery life under any workload
Group: Applications/System
License: BSD
-URL: http://www.lesswatts.org/projects/bltk/
+URL: http://www.lesswatts.org/projects/bltk/
Source0: http://www.lesswatts.org/patches/bltk/%{name}-%{version}.tar.gz
Source1: bltk.conf
Source2: OOCALC_FILE_SAMPLE.ods
@@ -13,21 +13,19 @@ Source3: OODRAW_FILE_SAMPLE.odg
Source4: OOWRITER_FILE_SAMPLE.odt
Patch1: bltk-1.0.9-man.patch
-Patch2: bltk-1.0.9-office_scen.patch
Patch3: bltk-1.0.9-bltk_paths.patch
Patch4: bltk-1.0.9-opt_developer.patch
-Patch5: bltk-1.0.9-cond_install.patch
+Patch5: bltk-1.1.0-cond_install.patch
Patch6: bltk-1.0.9-opt_game.patch
Patch7: bltk-1.0.9-conf.patch
Patch8: bltk-1.0.9-opt_office.patch
-Patch9: bltk-1.0.9-hdparm.patch
Patch10: bltk-1.0.9-opt_player.patch
Patch11: bltk-1.0.9-home_dir.patch
Patch12: bltk-1.0.9-opt_reader.patch
Patch13: bltk-1.0.9-installed.patch
Patch15: bltk-1.0.9-xse.patch
Patch16: bltk-1.0.9-conf_home.patch
-Patch17: bltk-1.0.9-rm_sudo.patch
+Patch17: bltk-1.1.0-rm_sudo.patch
Patch18: bltk-1.0.9-plot-path.patch
Patch19: bltk-1.0.9-rpm.patch
@@ -51,18 +49,16 @@ The following workloads are currently implemented:
office activities (based on OpenOffice.org office suit)
%prep
-%setup -q
+%setup -q -n bltk
# %patch0 -p1 -b .all
%patch1 -p1 -b .man
-%patch2 -p1 -b .office_scen
%patch3 -p1 -b .bltk_paths
%patch4 -p1 -b .opt_developer
%patch5 -p1 -b .cond_install
%patch6 -p1 -b .opt_game
%patch7 -p1 -b .conf
%patch8 -p1 -b .opt_office
-%patch9 -p1 -b .hdparm
%patch10 -p1 -b .opt_player
%patch11 -p1 -b .home_dir
%patch12 -p1 -b .opt_reader
@@ -234,6 +230,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/bltk/wl_reader/war_and_peace.html
%changelog
+* Thu Mar 29 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.1.0-1
+- New version
+- Dropped office_scen patch (upstreamed)
+- Dropped hdparm patch (upstream added support for LVM)
+- Reworked rm_sudo patch
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 3183740..e7961c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3234b3eefc22b4e6a6aa538a5b6e20d bltk-1.0.9.tar.gz
+c2bc40133854127ddbbe3c38469a52d7 bltk-1.1.0.tar.gz
More information about the scm-commits
mailing list