- pass proper CFLAGS via %rpmcflags

Changed files:
    httping-Makefile.patch -> 1.1
    httping.spec -> 1.5

diff --git a/httping-Makefile.patch b/httping-Makefile.patch
new file mode 100644 (file)
index 0000000..fee91d0
--- /dev/null
+++ b/httping-Makefile.patch
@@ -0,0 +1,12 @@
+--- httping-0.0.96/Makefile~   2005-01-24 22:55:19.872476424 +0100
++++ httping-0.0.96/Makefile    2005-01-24 22:56:16.282900736 +0100
+@@ -16,7 +16,8 @@
+ 
+ DEBUG=#-g
+ LDFLAGS=-lssl $(DEBUG)
+-CFLAGS=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
++CFLAGS ?= -O2
++override CFLAGS += -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
+ 
+ OBJS=http.o io.o str.o error.o utils.o main.o tcp.o mssl.o
+ 

diff --git a/httping.spec b/httping.spec
index e88f7610a5ff9127f91ba121b72160e04c8e0e86..2afa48038f8faf87ecfcbfeefe70a8a76d361a88 100644 (file)
--- a/httping.spec
+++ b/httping.spec
@@ -7,7 +7,7 @@ License:        GPL
 Group:         Networking/Utilities
 Source0:       http://www.vanheusden.com/httping/%{name}-%{version}.tgz
 # Source0-md5: 04ce13275795676f6bb533154574949e
-Patch0:                %{name}-makefile.patch
+Patch0:                %{name}-Makefile.patch
 URL:           http://www.vanheusden.com/httping/
 BuildRequires: openssl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,12 +27,11 @@ statystycznych.
 
 %prep
 %setup -q
-%patch -p0
+%patch0 -p1
 
 %build
 %{__make} \
-       CC="%{__cc}" \
-       DEBUG="%{rpmcflags}"
+       CC="%{__cc}" CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT