commit 04c131dfdf173c6a0be40fe2e4533fff1735d00b
Author: Elan Ruusamäe <[email protected]>
Date: Fri Feb 8 14:25:10 2013 +0200
patch makefile to accept our buildflags
make.patch | 21 +++++++++++++++++++++
psensor.spec | 6 ++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/psensor.spec b/psensor.spec
index d2725f8..ecf66b9 100644
--- a/psensor.spec
+++ b/psensor.spec
@@ -7,11 +7,11 @@ Group: X11/Applications
URL: http://wpitchoune.net/psensor
Source0:
http://wpitchoune.net/psensor/files/%{name}-%{version}-src.tar.gz
# Source0-md5: 6765f61fa2b0c4118e88b0771e628130
+Patch0: make.patch
BuildRequires: GConf2-devel
BuildRequires: cairo-devel
BuildRequires: gcc
BuildRequires: gtk+2-devel
-BuildRequires: sed >= 4.0
BuildRequires: lm_sensors-devel
Requires: hddtemp
Requires: lm_sensors
@@ -30,9 +30,7 @@ It is based on:
%prep
%setup -q
-
-%{__sed} -i -e 's,-Wall -O3,$(OPTFLAGS),' Makefile
-
+%patch0 -p1
%build
%{__make} \
diff --git a/make.patch b/make.patch
new file mode 100644
index 0000000..152e6f9
--- /dev/null
+++ b/make.patch
@@ -0,0 +1,21 @@
+diff -ur -x .svn -x .git -x .bzr -x CVS psensor-0.4.4/Makefile
psensor-0.4.4-make/Makefile
+--- psensor-0.4.4/Makefile 2010-10-01 13:18:06.000000000 +0300
++++ psensor-0.4.4-make/Makefile 2013-02-08 14:24:09.907759921 +0200
+@@ -29,7 +29,7 @@
+ #OBJS+= nvidia.o
+ #CC_D+= -D NVIDIA_SUPPORT
+
+-CC_OPTS=-Wall -O3 `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}`
${CC_D}
++CC_OPTS=$(OPTFLAGS) `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}`
${CC_D}
+
+ ################### PSensor Server ######################
+
+@@ -42,7 +42,7 @@
+ #CC_D_SERVER+= -D NVIDIA_SUPPORT
+ #LD_OPTS_SERVER+= -lX11 -lXext /usr/lib/libXNVCtrl.a
+
+-CC_OPTS_SERVER=-Wall -O3 ${CC_D_SERVER}
++CC_OPTS_SERVER=$(OPTFLAGS) ${CC_D_SERVER}
+
+ all:psensor psensor-server
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/psensor.git/commitdiff/069706fa1d611b3b1e5cf8db77d7de731ec4521e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
