packages: dmidecode/dmidecode.spec - remove workaround for BSD make from Ma...

sparky sparky at pld-linux.org
Thu Jan 6 21:57:22 CET 2011


Author: sparky                       Date: Thu Jan  6 20:57:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove workaround for BSD make from Makefile
- more rpm*flags

---- Files affected:
packages/dmidecode:
   dmidecode.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/dmidecode/dmidecode.spec
diff -u packages/dmidecode/dmidecode.spec:1.20 packages/dmidecode/dmidecode.spec:1.21
--- packages/dmidecode/dmidecode.spec:1.20	Mon Nov 24 01:30:14 2008
+++ packages/dmidecode/dmidecode.spec	Thu Jan  6 21:57:17 2011
@@ -9,6 +9,7 @@
 Source0:	http://savannah.nongnu.org/download/dmidecode/%{name}-%{version}.tar.bz2
 # Source0-md5:	3c9c4d55a40b78600f3b43bfa64616f9
 URL:		http://www.nongnu.org/dmidecode/
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,10 +27,14 @@
 %prep
 %setup -q
 
+# GNU make no longer ignores != assignment
+sed '/PROGRAMS !=/d' -i Makefile
+
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -W -pedantic"
+	CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall -W -pedantic" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +60,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2011/01/06 20:57:17  sparky
+- remove workaround for BSD make from Makefile
+- more rpm*flags
+
 Revision 1.20  2008/11/24 00:30:14  pawelz
 - up to 2.10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dmidecode/dmidecode.spec?r1=1.20&r2=1.21&f=u



More information about the pld-cvs-commit mailing list