- disabled php extension, build nondeterministic on builders

[packages/linux-gpib.git] / linux-gpib.spec

diff --git a/linux-gpib.spec b/linux-gpib.spec
index 2a5dbead6536b516ed36ed73a6c8af76036145ae..6c271277015f598df498e501d6b0afe3afe724ef 100644 (file)
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -12,7 +12,7 @@
 %bcond_without static_libs     # static library
 %bcond_without guile           # guile binding
 %bcond_without perl            # Perl binding
-%bcond_without php             # PHP binding
+%bcond_with    php             # PHP binding
 %bcond_without python          # Python binding
 %bcond_without tcl             # Tcl binding
 
@@ -33,13 +33,13 @@ exit 1
 %include       /usr/lib/rpm/macros.perl
 %define                php_name        php%{?php_suffix}
 
-%define                rel     2
+%define                rel     7
 %define                pname   linux-gpib
 Summary:       GPIB (IEEE 488) Linux support
 Summary(pl.UTF-8):     Obsługa GPIB (IEEE 488) dla Linuksa
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:       4.0.3
-Release:       %{rel}
+Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-gpib/%{pname}-%{version}.tar.gz
@@ -242,6 +242,7 @@ TOPDIR=$(pwd)\
 %build_kernel_modules -C drivers/gpib -m gpib -- EARLYCPPFLAGS="-I$TOPDIR -I$TOPDIR/drivers/gpib/include -I$TOPDIR/include"\
 cd drivers/gpib\
 %install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,hp_82341/hp_82341,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,lpvo_usb_gpib/lpvo_usb_gpib,ni_usb/ni_usb_gpib} -d kernel/gpib\
+cd ../..\
 %{nil}
 
 %define install_kernel_pkg()\
@@ -250,7 +251,7 @@ cd drivers/gpib\
 %{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1