SPECS: audit.spec, avahi.spec, bacula.spec, bcm5700.spec, beagle.s...

sparky sparky at pld-linux.org
Mon Nov 13 15:53:26 CET 2006 

Author: sparky                       Date: Mon Nov 13 14:53:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't use %{without ...}, it may not work after inverting bcond

---- Files affected:
SPECS:
   audit.spec (1.31 -> 1.32) , avahi.spec (1.53 -> 1.54) , bacula.spec (1.48 -> 1.49) , bcm5700.spec (1.51 -> 1.52) , beagle.spec (1.94 -> 1.95) , blackbird-firmware.spec (1.2 -> 1.3) , captive-drivers.spec (1.6 -> 1.7) , cdrdao.spec (1.64 -> 1.65) , changepassword.spec (1.21 -> 1.22) , cisco-vpnclient.spec (1.15 -> 1.16) , crossmingw32-gcc.spec (1.69 -> 1.70) , cyrus-sasl.spec (1.157 -> 1.158) , dazuko.spec (1.18 -> 1.19) , db4.2.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/audit.spec
diff -u SPECS/audit.spec:1.31 SPECS/audit.spec:1.32
--- SPECS/audit.spec:1.31	Sat Oct 28 00:11:44 2006
+++ SPECS/audit.spec	Mon Nov 13 15:53:20 2006
@@ -117,7 +117,7 @@
 install -D %{SOURCE1} lib/linux/audit.h
 install -D %{SOURCE1} src/mt/linux/audit.h
 
-%if %{without python}
+%if !%{with python}
 sed '/PYTHON/d; s#swig/Makefile ##' -i configure.ac
 sed 's/swig//' -i Makefile.am
 %endif
@@ -245,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.31  2006/10/27 22:11:44  qboosh
 - updated to 1.2.9
 

================================================================
Index: SPECS/avahi.spec
diff -u SPECS/avahi.spec:1.53 SPECS/avahi.spec:1.54
--- SPECS/avahi.spec:1.53	Sat Oct  7 17:13:47 2006
+++ SPECS/avahi.spec	Mon Nov 13 15:53:20 2006
@@ -10,7 +10,7 @@
 %bcond_without	qt3		# build without qt3 bindings
 %bcond_without	qt4		# build without qt4 bindings
 #
-%if %{without qt}
+%if !%{with qt}
 %undefine	with_qt3
 %undefine	with_qt4
 %endif
@@ -667,6 +667,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.53  2006/10/07 15:13:47  qboosh
 - wants python >= 2.4
 

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.48 SPECS/bacula.spec:1.49
--- SPECS/bacula.spec:1.48	Fri Oct 20 19:48:00 2006
+++ SPECS/bacula.spec	Mon Nov 13 15:53:20 2006
@@ -476,7 +476,7 @@
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/%{name}/{gconsole,startmysql,stopmysql,bacula,bconsole,fd}
 rm -f $RPM_BUILD_ROOT%{_sbindir}/static-bacula-fd
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome*
-%if %{without console_wx}
+%if !%{with console_wx}
 rm -f $RPM_BUILD_ROOT%{_desktopdir}/bacula-wx.desktop
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wx-console*
 %endif
@@ -801,6 +801,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.48  2006/10/20 17:48:00  sls
 - removed dvd_restore patch (probably outdated)
 - added compile and link patches

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.51 SPECS/bcm5700.spec:1.52
--- SPECS/bcm5700.spec:1.51	Wed Apr 12 14:15:40 2006
+++ SPECS/bcm5700.spec	Mon Nov 13 15:53:20 2006
@@ -7,7 +7,7 @@
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -175,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.51  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/beagle.spec
diff -u SPECS/beagle.spec:1.94 SPECS/beagle.spec:1.95
--- SPECS/beagle.spec:1.94	Sun Nov  5 14:21:12 2006
+++ SPECS/beagle.spec	Mon Nov 13 15:53:20 2006
@@ -15,7 +15,7 @@
 %bcond_without	epiphany	# don't build epiphany extension
 %bcond_with	sqlite3		# use sqlite3 instead of sqlite2
 #
-%if %{without gui}
+%if !%{with gui}
 %undefine	with_evolution
 %endif
 #
@@ -395,6 +395,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.94  2006/11/05 13:21:12  deejay1
 - up to 0.2.12
 

================================================================
Index: SPECS/blackbird-firmware.spec
diff -u SPECS/blackbird-firmware.spec:1.2 SPECS/blackbird-firmware.spec:1.3
--- SPECS/blackbird-firmware.spec:1.2	Sun Oct  8 18:06:02 2006
+++ SPECS/blackbird-firmware.spec	Mon Nov 13 15:53:20 2006
@@ -24,7 +24,7 @@
 %description
 This package contains the firmware for the MPEG-2 encoder on the
 cx23416 based TV tuner/PVR cards supported by cx88-blackbird driver.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 This package does not include the firmware. You should build the 
 package yourself with "--with license_agreement" and install the wla 
 release.
@@ -34,7 +34,7 @@
 Ten pakiet zawiera firmware sprzętowego kodera MPEG-2 obsługiwanych
 przez sterownik cx88-blackbird kart telewizyjnych opartych ba układzie
 cx23416.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Ten pakiet nie zawiera firmware. Powinieneś zbudować pakiet własnoręcznie
 z opcją "--with license_agreement" i zainstalować wersję wla.
 %endif
@@ -68,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.2  2006/10/08 16:06:02  qboosh
 - pl fix, simplified setup
 

================================================================
Index: SPECS/captive-drivers.spec
diff -u SPECS/captive-drivers.spec:1.6 SPECS/captive-drivers.spec:1.7
--- SPECS/captive-drivers.spec:1.6	Thu Jan 26 23:14:30 2006
+++ SPECS/captive-drivers.spec	Mon Nov 13 15:53:20 2006
@@ -36,7 +36,7 @@
 
 %description
 Contains ntfs.sys and ntoskrnl.exe from Windows XP SP1.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 License issues made us not to include inherent files into this package
 by default. If you want to create full working package please build it
 with the following command:
@@ -46,7 +46,7 @@
 
 %description -l pl
 Pakiet zawierający ntfs.sys i ntoskrnl.exe z Windows XP SP1.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Kwestie licencji zmusiły nas do niedołączania do tego pakietu istotnych
 plików. Jeśli chcesz stworzyć w pełni funkcjonalny pakiet, zbuduj go za
 pomocą polecenia:
@@ -65,7 +65,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -82,7 +82,7 @@
 install ntfs.sys ntoskrnl.exe $RPM_BUILD_ROOT/var/lib/captive
 %endif
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %post
 %{_bindir}/%{base_name}.install
 %endif
@@ -105,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.6  2006/01/26 22:14:30  glen
 - the download is 145mb of size
 

================================================================
Index: SPECS/cdrdao.spec
diff -u SPECS/cdrdao.spec:1.64 SPECS/cdrdao.spec:1.65
--- SPECS/cdrdao.spec:1.64	Sat Feb 25 19:29:44 2006
+++ SPECS/cdrdao.spec	Mon Nov 13 15:53:20 2006
@@ -84,7 +84,7 @@
 %patch2 -p1
 
 sed -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
-%if %{without gnome}
+%if !%{with gnome}
 sed -i -e 's/^en_xdao=yes$/en_xdao=no/' configure.ac
 %endif
 
@@ -145,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.64  2006/02/25 18:29:44  sparky
 - pass CFLAGS and __cc
 

================================================================
Index: SPECS/changepassword.spec
diff -u SPECS/changepassword.spec:1.21 SPECS/changepassword.spec:1.22
--- SPECS/changepassword.spec:1.21	Wed Jul 26 17:02:19 2006
+++ SPECS/changepassword.spec	Mon Nov 13 15:53:20 2006
@@ -46,10 +46,10 @@
 	--enable-logo=pldlogo.png \
 	--enable-smbpasswd=%{_sysconfdir}/smbpasswd \
 	--enable-squidpasswd=%{_sysconfdir}/squid/passwd \
-%if %{without samba}
+%if !%{with samba}
 	--disable-smbpasswd \
 %endif
-%if %{without squid}
+%if !%{with squid}
 	--disable-squidpasswd
 %endif
 
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.21  2006/07/26 15:02:19  glen
 - avoid defining default %attr
 

================================================================
Index: SPECS/cisco-vpnclient.spec
diff -u SPECS/cisco-vpnclient.spec:1.15 SPECS/cisco-vpnclient.spec:1.16
--- SPECS/cisco-vpnclient.spec:1.15	Sun Apr 16 23:31:40 2006
+++ SPECS/cisco-vpnclient.spec	Mon Nov 13 15:53:20 2006
@@ -8,7 +8,7 @@
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine with_dist_kernel
 %endif
 %define		_rel	0.1
@@ -92,7 +92,7 @@
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
 	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-%if %{without dist_kernel}
+%if !%{with dist_kernel}
 	ln -sf %{_kernelsrcdir}/scripts
 %endif
 	touch include/config/MARKER
@@ -203,6 +203,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.15  2006/04/16 21:31:40  glen
 - fix chkconfig, rc-scripts deps
 

================================================================
Index: SPECS/crossmingw32-gcc.spec
diff -u SPECS/crossmingw32-gcc.spec:1.69 SPECS/crossmingw32-gcc.spec:1.70
--- SPECS/crossmingw32-gcc.spec:1.69	Wed Aug  2 08:00:22 2006
+++ SPECS/crossmingw32-gcc.spec	Mon Nov 13 15:53:20 2006
@@ -30,7 +30,7 @@
 BuildRequires:	bison
 BuildRequires:	crossmingw32-binutils >= 2.15.91.0.2-2
 BuildRequires:	flex
-%if %{without bootstrap}
+%if !%{with bootstrap}
 BuildRequires:	crossmingw32-runtime >= 3.5
 BuildRequires:	crossmingw32-w32api >= 3.1
 %endif
@@ -369,6 +369,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.69  2006/08/02 06:00:22  pluto
 - fortran requires mpfr-devel.
 

================================================================
Index: SPECS/cyrus-sasl.spec
diff -u SPECS/cyrus-sasl.spec:1.157 SPECS/cyrus-sasl.spec:1.158
--- SPECS/cyrus-sasl.spec:1.157	Wed Nov  8 12:56:57 2006
+++ SPECS/cyrus-sasl.spec	Mon Nov 13 15:53:20 2006
@@ -15,7 +15,7 @@
 %bcond_with	pwcheck		# build pwcheck helper (deprecated)
 %bcond_with	x509		# build x509 plugin (no sources in package???)
 #
-%if %{without mysql} && %{without pgsql}
+%if !%{with mysql} && !%{with pgsql}
 %undefine with_cryptedpw
 %endif
 
@@ -668,6 +668,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.158  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.157  2006/11/08 11:56:57  jajcus
 - automake 1.10 compatibility patch added
 

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.18 SPECS/dazuko.spec:1.19
--- SPECS/dazuko.spec:1.18	Thu Mar  2 19:45:05 2006
+++ SPECS/dazuko.spec	Mon Nov 13 15:53:20 2006
@@ -7,7 +7,7 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 #
@@ -274,6 +274,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.18  2006/03/02 18:45:05  glen
 - kernel epoch is 3
 

================================================================
Index: SPECS/db4.2.spec
diff -u SPECS/db4.2.spec:1.76 SPECS/db4.2.spec:1.77
--- SPECS/db4.2.spec:1.76	Wed Oct  4 10:28:41 2006
+++ SPECS/db4.2.spec	Mon Nov 13 15:53:20 2006
@@ -230,7 +230,7 @@
 %patch4 -p0
 %patch5 -p1
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -421,6 +421,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2006/11/13 14:53:20  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.76  2006/10/04 08:28:41  qboosh
 - merged official patches 3,4 and amd64-fastmutex patch from db:AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/avahi.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.48&r2=1.49&f=u
    http://cvs.pld-linux.org/SPECS/bcm5700.spec?r1=1.51&r2=1.52&f=u
    http://cvs.pld-linux.org/SPECS/beagle.spec?r1=1.94&r2=1.95&f=u
    http://cvs.pld-linux.org/SPECS/blackbird-firmware.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/captive-drivers.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/cdrdao.spec?r1=1.64&r2=1.65&f=u
    http://cvs.pld-linux.org/SPECS/changepassword.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/cisco-vpnclient.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/crossmingw32-gcc.spec?r1=1.69&r2=1.70&f=u
    http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.157&r2=1.158&f=u
    http://cvs.pld-linux.org/SPECS/dazuko.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/db4.2.spec?r1=1.76&r2=1.77&f=u

More information about the pld-cvs-commit mailing list