From 4fdad4b492398e6d722e1689eca9d2003a5fefa5 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 05 2014 20:17:48 +0000 Subject: import bltk-1.1.0-9.el7.src.rpm --- diff --git a/SOURCES/bltk-1.1.0-cflags-override.patch b/SOURCES/bltk-1.1.0-cflags-override.patch new file mode 100644 index 0000000..67ed015 --- /dev/null +++ b/SOURCES/bltk-1.1.0-cflags-override.patch @@ -0,0 +1,143 @@ +diff --git a/tools/analyzer/Makefile b/tools/analyzer/Makefile +index 16f2485..68d044c 100644 +--- a/tools/analyzer/Makefile ++++ b/tools/analyzer/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/bat_drain/Makefile b/tools/bat_drain/Makefile +index 19bfd59..ea4898d 100644 +--- a/tools/bat_drain/Makefile ++++ b/tools/bat_drain/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/bltk/Makefile b/tools/bltk/Makefile +index 8ab4c4f..8a80543 100644 +--- a/tools/bltk/Makefile ++++ b/tools/bltk/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../../include ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I../../include + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/get_realpath/Makefile b/tools/get_realpath/Makefile +index 6402cf9..e62558e 100644 +--- a/tools/get_realpath/Makefile ++++ b/tools/get_realpath/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/sudo/Makefile b/tools/sudo/Makefile +index 30bc7c6..3cea1d8 100644 +--- a/tools/sudo/Makefile ++++ b/tools/sudo/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/time/Makefile b/tools/time/Makefile +index cf89d0d..60074a1 100644 +--- a/tools/time/Makefile ++++ b/tools/time/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/type_command/Makefile b/tools/type_command/Makefile +index 61f082e..60c48bc 100644 +--- a/tools/type_command/Makefile ++++ b/tools/type_command/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + #LDFLAGS = -L/usr/X11R6/lib -lX11 + + BIN = ../../bin +diff --git a/tools/xse/Makefile b/tools/xse/Makefile +index a416e94..0c72872 100644 +--- a/tools/xse/Makefile ++++ b/tools/xse/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I ../../include -fPIC ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I ../../include -fPIC + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -Wl,-soname -Wl,libxse.so.0 + + LIB = ../../lib +diff --git a/wl_developer/Makefile b/wl_developer/Makefile +index 373a1ca..280e2b0 100644 +--- a/wl_developer/Makefile ++++ b/wl_developer/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I../include + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk + + BIN = bin +diff --git a/wl_game/Makefile b/wl_game/Makefile +index 4114322..2590925 100644 +--- a/wl_game/Makefile ++++ b/wl_game/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I../include + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk + + BIN = bin +diff --git a/wl_office/Makefile b/wl_office/Makefile +index 39d5783..2caa9ba 100644 +--- a/wl_office/Makefile ++++ b/wl_office/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I../include + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk + + BIN = bin +diff --git a/wl_player/Makefile b/wl_player/Makefile +index 486bb11..f218f2b 100644 +--- a/wl_player/Makefile ++++ b/wl_player/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 + + BIN = bin +diff --git a/wl_reader/Makefile b/wl_reader/Makefile +index c73c1ca..9e40033 100644 +--- a/wl_reader/Makefile ++++ b/wl_reader/Makefile +@@ -1,5 +1,5 @@ + +-CFLAGS = -Wall -pedantic -std=c99 -g -O2 -I../include ++override CFLAGS += -Wall -pedantic -std=c99 -g -O2 -I../include + LDFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ../lib/libxse.so.0 -Wl,-rpath,/usr/lib/bltk + + BIN = bin diff --git a/SPECS/bltk.spec b/SPECS/bltk.spec index abb2e0b..90cbf27 100644 --- a/SPECS/bltk.spec +++ b/SPECS/bltk.spec @@ -1,6 +1,6 @@ Name: bltk Version: 1.1.0 -Release: 4%{?dist} +Release: 9%{?dist} Summary: The BLTK measures notebook battery life under any workload Group: Applications/System @@ -28,6 +28,7 @@ Patch16: bltk-1.0.9-conf_home.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,10 +69,10 @@ The following workloads are currently implemented: %patch17 -p1 -b .rm_sudo %patch18 -p1 -b .plot-path %patch19 -p1 -b .rpm +%patch20 -p1 -b .cflags-override %build -export CFLAGS="$RPM_OPT_FLAGS" -make +make CFLAGS="$RPM_OPT_FLAGS" #make %{?_smp_mflags} %install @@ -100,12 +101,6 @@ install -m 755 bin/bat_drain ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain install -m 755 bin/bat_drain_table ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain_table install -m 755 bin/bltk ${RPM_BUILD_ROOT}%{_libdir}/bltk/bin -ln -s %{_libdir}/bltk/bin/bltk ${RPM_BUILD_ROOT}%{_bindir}/bltk -ln -s %{_libdir}/bltk/bin/bltk_plot ${RPM_BUILD_ROOT}%{_bindir}/bltk_plot -ln -s %{_libdir}/bltk/bin/bltk_report ${RPM_BUILD_ROOT}%{_bindir}/bltk_report -ln -s %{_libdir}/bltk/bin/bltk_report_compress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_compress -ln -s %{_libdir}/bltk/bin/bltk_report_table ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_table -ln -s %{_libdir}/bltk/bin/bltk_report_uncompress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_uncompress install -m 755 lib/libxse.so.0 ${RPM_BUILD_ROOT}%{_libdir}/bltk/lib/libxse.so.0 @@ -137,6 +132,22 @@ install -m 755 wl_reader/bin/bltk_wl_reader ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_ install -m 755 wl_reader/bin/bltk_wl_reader_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader/bin install -m 644 wl_reader/war_and_peace.html ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader +cat << ":EOF" > ${RPM_BUILD_ROOT}%{_bindir}/bltk +#!/bin/sh + +bltk_native="$(rpm --eval '%%{_libdir}')/bltk/bin/$(basename $0)" + +[ -x "$bltk_native" ] && exec "$bltk_native" "$@" +exec /usr/lib/bltk/bin/$(basename $0) "$@" +:EOF +chmod a+rx ${RPM_BUILD_ROOT}%{_bindir}/bltk +pushd ${RPM_BUILD_ROOT}%{_bindir} +for f in bltk_plot bltk_report bltk_report_compress bltk_report_table bltk_report_uncompress; +do + ln -s bltk $f +done +popd + %clean rm -rf $RPM_BUILD_ROOT @@ -230,6 +241,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/bltk/wl_reader/war_and_peace.html %changelog +* Wed Mar 5 2014 Jaroslav Škarvada - 1.1.0-9 +- Improved multilib + Related: rhbz#1057086 + +* Wed Mar 5 2014 Jaroslav Škarvada - 1.1.0-8 +- Fixed multilib + Resolves: rhbz#1057086 + +* Mon Mar 3 2014 Jaroslav Škarvada - 1.1.0-7 +- Fixed application of CFLAGS + Resolves: rhbz#1070787 + +* Fri Jan 24 2014 Daniel Mach - 1.1.0-6 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.1.0-5 +- Mass rebuild 2013-12-27 + * Wed Feb 13 2013 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild