packages: dhcp_probe/dhcp_probe.spec - fix build on 64 bit archs - mask Sys...

[baggins]

Author: baggins                      Date: Fri Apr 20 11:53:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build on 64 bit archs
- mask SysV service for systemd

---- Files affected:
packages/dhcp_probe:
   dhcp_probe.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dhcp_probe/dhcp_probe.spec
diff -u packages/dhcp_probe/dhcp_probe.spec:1.1 packages/dhcp_probe/dhcp_probe.spec:1.2
--- packages/dhcp_probe/dhcp_probe.spec:1.1	Fri Apr 20 13:41:22 2012
+++ packages/dhcp_probe/dhcp_probe.spec	Fri Apr 20 13:53:28 2012
@@ -2,7 +2,7 @@
 Summary:	Tool for discovering DHCP and BootP servers
 Name:		dhcp_probe
 Version:	1.3.0
-Release:	0.1
+Release:	0.2
 License:	GPLv2+ and MIT
 Group:		Applications
 Source0:	http://www.net.princeton.edu/software/dhcp_probe/%{name}-%{version}.tar.gz
@@ -40,6 +40,11 @@
 cp -a extras/README README.extras
 
 %build
+%ifarch %{x8664}
+export CFLAGS="%{rpmcflags} -D__ARCH__=64"
+%else
+export CFLAGS="%{rpmcflags} -D__ARCH__=32"
+%endif
 %configure
 %{__make}
 
@@ -54,6 +59,7 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp_probe
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/dhcp_probe
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/dhcp_probe at .service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/dhcp_probe.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +87,7 @@
 %attr(755,root,root) %{_sbindir}/dhcp_probe
 %attr(754,root,root) /etc/rc.d/init.d/dhcp_probe
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp_probe
+%{systemdunitdir}/%{name}.service
 %{systemdunitdir}/%{name}@.service
 %{_mandir}/man5/dhcp_probe.cf.5*
 %{_mandir}/man8/dhcp_probe.8*
@@ -91,6 +98,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/04/20 11:53:28  baggins
+- fix build on 64 bit archs
+- mask SysV service for systemd
+
 Revision 1.1  2012/04/20 11:41:22  baggins
 - new
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dhcp_probe/dhcp_probe.spec?r1=1.1&r2=1.2