[rrd-developers] Fix --without php option in RPM spec file

[Anton Blanchard]

Hi,

The RPM spec file in svn looks for the php source even when building
with it disabled:

# rpmbuild --without php -ba rrdtool.spec
error: File /usr/src/redhat/SOURCES/php4-r1190.tar.gz: No such file or directory

The patch below fixes it. In the process I had to fix:

%{?with_php: -a 1}

which is always true, since with_php is always defined to either 0 or 1.

Anton

--- rrdtool.spec.orig	2008-06-22 22:04:51.000000000 -0400
+++ rrdtool.spec	2008-06-23 03:08:30.000000000 -0400
@@ -16,8 +16,10 @@
 URL: http://oss.oetiker.ch/rrdtool/
 #Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{pre}.tar.gz
+%if %{with_php}
 Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -142,9 +144,11 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{pre} %{?with_php: -a 1}
 %if %{with_php}
+%setup -q -n %{name}-%{version}%{pre} -a 1
 %patch1 -p1
+%else
+%setup -q -n %{name}-%{version}%{pre}
 %endif
 
 # Fix to find correct python dir on lib64
@@ -153,8 +157,10 @@
 
 # Most edits shouldn't be necessary when using --libdir, but
 # w/o, some introduce hardcoded rpaths where they shouldn't
-%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
-    configure Makefile.in php4/configure php4/ltconfig*
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in*
+%if %{with_php}
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' php4/configure php4/ltconfig*
+%endif
 
 # Perl 5.10 seems to not like long version strings, hack around it
 %{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
@@ -163,7 +169,10 @@
 #
 # fix config files for php4 bindings
 # workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
+%if %{with_php}
 cp -p /usr/lib/rpm/config.{guess,sub} php4/
+%endif
+
 
 %build
 %configure \