From cd5fcb28b28705758327930f149de19c27dbe2a4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:25:43 +0000 Subject: import bltk-1.1.0-10.el7 --- diff --git a/.bltk.metadata b/.bltk.metadata index 148173c..b736c72 100644 --- a/.bltk.metadata +++ b/.bltk.metadata @@ -1,4 +1,4 @@ -cfa9af9dc835a1306f47044f20603ebc87544670 SOURCES/OOWRITER_FILE_SAMPLE.odt b2f0e91e47d520c084886d45d6d1ae0b3bbba4a1 SOURCES/OOCALC_FILE_SAMPLE.ods 95471e77bcea7b10d33da79d692389632d123b7e SOURCES/OODRAW_FILE_SAMPLE.odg +cfa9af9dc835a1306f47044f20603ebc87544670 SOURCES/OOWRITER_FILE_SAMPLE.odt e836bed25688ff9916a315f41d50f48203b215b7 SOURCES/bltk-1.1.0.tar.gz diff --git a/.gitignore b/.gitignore index fcd8206..05e2640 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/OOWRITER_FILE_SAMPLE.odt SOURCES/OOCALC_FILE_SAMPLE.ods SOURCES/OODRAW_FILE_SAMPLE.odg +SOURCES/OOWRITER_FILE_SAMPLE.odt SOURCES/bltk-1.1.0.tar.gz diff --git a/SOURCES/bltk-1.1.0-fix-tmp-files.patch b/SOURCES/bltk-1.1.0-fix-tmp-files.patch new file mode 100644 index 0000000..4d5b4c2 --- /dev/null +++ b/SOURCES/bltk-1.1.0-fix-tmp-files.patch @@ -0,0 +1,15 @@ +diff --git a/tools/bltk/bltk_get_hdparm.sh b/tools/bltk/bltk_get_hdparm.sh +index 4f6a53b..72ca33d 100644 +--- a/tools/bltk/bltk_get_hdparm.sh ++++ b/tools/bltk/bltk_get_hdparm.sh +@@ -57,8 +57,8 @@ PARTITIONS=$1 + + FOUND=0 + READING=0 +-TMP_FILE=$BLTK_ROOT/tmp/hdparm +-DEV_INFO=$BLTK_HOME/tmp/dev_info ++TMP_FILE=`mktemp`.hdparm ++DEV_INFO=`mktemp`.dev_info + + /usr/bin/udisksctl dump > $TMP_FILE + diff --git a/SPECS/bltk.spec b/SPECS/bltk.spec index 90cbf27..4132f72 100644 --- a/SPECS/bltk.spec +++ b/SPECS/bltk.spec @@ -1,6 +1,6 @@ Name: bltk Version: 1.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The BLTK measures notebook battery life under any workload Group: Applications/System @@ -29,6 +29,7 @@ Patch17: bltk-1.1.0-rm_sudo.patch Patch18: bltk-1.0.9-plot-path.patch Patch19: bltk-1.0.9-rpm.patch Patch20: bltk-1.1.0-cflags-override.patch +Patch21: bltk-1.1.0-fix-tmp-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +71,7 @@ The following workloads are currently implemented: %patch18 -p1 -b .plot-path %patch19 -p1 -b .rpm %patch20 -p1 -b .cflags-override +%patch21 -p1 -b .fix-tmp-files %build make CFLAGS="$RPM_OPT_FLAGS" @@ -241,6 +243,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/bltk/wl_reader/war_and_peace.html %changelog +* Tue Mar 21 2017 Jaroslav Škarvada - 1.1.0-10 +- Fixed temporary files creation + Resolves: rhbz#1102089 + * Wed Mar 5 2014 Jaroslav Škarvada - 1.1.0-9 - Improved multilib Related: rhbz#1057086