diff --git a/bltk-1.1.0-cflags-override.patch b/bltk-1.1.0-cflags-override.patch new file mode 100644 index 0000000..67ed015 --- /dev/null +++ b/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/bltk.spec b/bltk.spec index 5bc5901..517c273 100644 --- a/bltk.spec +++ b/bltk.spec @@ -1,6 +1,6 @@ Name: bltk Version: 1.1.0 -Release: 5%{?dist} +Release: 6%{?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 @@ -230,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/bltk/wl_reader/war_and_peace.html %changelog +* Mon Mar 3 2014 Jaroslav Škarvada - 1.1.0-6 +- Fixed application of CFLAGS + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild