SPECS: kernel-misc-qvm86.spec, kernel-misc-toshbt.spec, kernel-vid...

sparky sparky at pld-linux.org
Mon Nov 13 16:00:17 CET 2006


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

---- Files affected:
SPECS:
   kernel-misc-qvm86.spec (1.3 -> 1.4) , kernel-misc-toshbt.spec (1.3 -> 1.4) , kernel-video-drm.spec (1.21 -> 1.22) , kernel-video-viafb.spec (1.3 -> 1.4) , kernel24.spec (1.779 -> 1.780) , libao.spec (1.61 -> 1.62) , libgda.spec (1.107 -> 1.108) , libglade.spec (1.79 -> 1.80) , librpcsecgss.spec (1.14 -> 1.15) , lighttpd.spec (1.190 -> 1.191) , linux-fusion.spec (1.6 -> 1.7) , linuxwacom.spec (1.15 -> 1.16) , lirc.spec (1.128 -> 1.129) , lirc24.spec (1.123 -> 1.124) , macromedia-flash.spec (1.59 -> 1.60) , mp1e.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-qvm86.spec
diff -u SPECS/kernel-misc-qvm86.spec:1.3 SPECS/kernel-misc-qvm86.spec:1.4
--- SPECS/kernel-misc-qvm86.spec:1.3	Sat Oct  7 13:30:46 2006
+++ SPECS/kernel-misc-qvm86.spec	Mon Nov 13 16:00:11 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
 #
@@ -158,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/10/07 11:30:46  qboosh
 - pl
 

================================================================
Index: SPECS/kernel-misc-toshbt.spec
diff -u SPECS/kernel-misc-toshbt.spec:1.3 SPECS/kernel-misc-toshbt.spec:1.4
--- SPECS/kernel-misc-toshbt.spec:1.3	Fri Sep  8 18:14:41 2006
+++ SPECS/kernel-misc-toshbt.spec	Mon Nov 13 16:00:11 2006
@@ -10,7 +10,7 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -165,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/09/08 16:14:41  qboosh
 - main desc
 

================================================================
Index: SPECS/kernel-video-drm.spec
diff -u SPECS/kernel-video-drm.spec:1.21 SPECS/kernel-video-drm.spec:1.22
--- SPECS/kernel-video-drm.spec:1.21	Wed Apr  5 10:28:28 2006
+++ SPECS/kernel-video-drm.spec	Mon Nov 13 16:00:11 2006
@@ -10,7 +10,7 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -156,6 +156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.21  2006/04/05 08:28:28  wiget
 - updated to 20060405 snapshot
 

================================================================
Index: SPECS/kernel-video-viafb.spec
diff -u SPECS/kernel-video-viafb.spec:1.3 SPECS/kernel-video-viafb.spec:1.4
--- SPECS/kernel-video-viafb.spec:1.3	Sun Oct  8 21:19:17 2006
+++ SPECS/kernel-video-viafb.spec	Mon Nov 13 16:00:11 2006
@@ -6,7 +6,7 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -168,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/10/08 19:19:17  qboosh
 - direct Source0 URL
 

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.779 SPECS/kernel24.spec:1.780
--- SPECS/kernel24.spec:1.779	Fri Nov  3 13:34:38 2006
+++ SPECS/kernel24.spec	Mon Nov 13 16:00:11 2006
@@ -1019,7 +1019,7 @@
 	echo "BUILDING KERNEL $*..."
 :> arch/%{base_arch}/defconfig
 	cat $RPM_SOURCE_DIR/%{name}-$Config.config >> arch/%{base_arch}/defconfig
-%if %{without um}
+%if !%{with um}
 %ifarch i386
 	echo "CONFIG_M386=y" >> arch/%{base_arch}/defconfig
 %endif
@@ -1714,6 +1714,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.780  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.779  2006/11/03 12:34:38  marcus
 - rel.2. stbr for Ac.
 

================================================================
Index: SPECS/libao.spec
diff -u SPECS/libao.spec:1.61 SPECS/libao.spec:1.62
--- SPECS/libao.spec:1.61	Sun Aug 27 08:12:52 2006
+++ SPECS/libao.spec	Mon Nov 13 16:00:11 2006
@@ -173,18 +173,18 @@
 %{__autoconf}
 %{__automake}
 %configure \
-%if %{without alsa}
+%if !%{with alsa}
 	--disable-alsa \
 %else
 	--enable-alsa \
 %endif
-%if %{without arts}
+%if !%{with arts}
 	--disable-arts \
 %endif
-%if %{without nas}
+%if !%{with nas}
 	--disable-nas \
 %endif
-%if %{without polypaudio}
+%if !%{with polypaudio}
 	--disable-polyp \
 %endif
 	--%{!?with_static_libs:dis}%{?with_static_libs:en}able-static
@@ -264,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.61  2006/08/27 06:12:52  pluto
 - release 4.
 

================================================================
Index: SPECS/libgda.spec
diff -u SPECS/libgda.spec:1.107 SPECS/libgda.spec:1.108
--- SPECS/libgda.spec:1.107	Wed Oct 25 12:23:28 2006
+++ SPECS/libgda.spec	Mon Nov 13 16:00:11 2006
@@ -254,7 +254,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%if %{without mdb06}
+%if !%{with mdb06}
 %patch1 -p1
 %endif
 %patch2 -p1
@@ -411,6 +411,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.107  2006/10/25 10:23:28  sls
 - release 4 to rebuild with mdbtools-0.6pre1
 - added bcond allowing build with mdbtools-0.5

================================================================
Index: SPECS/libglade.spec
diff -u SPECS/libglade.spec:1.79 SPECS/libglade.spec:1.80
--- SPECS/libglade.spec:1.79	Sun Mar 27 15:10:20 2005
+++ SPECS/libglade.spec	Mon Nov 13 16:00:11 2006
@@ -8,7 +8,7 @@
 %bcond_with	gnomedb	# with gnomedb libs
 #			  and with gnomedb support in libglade-config
 #
-%if %{without gnome}
+%if !%{with gnome}
 %undefine	with_bonobo
 %undefine	with_gnomedb
 %endif
@@ -401,6 +401,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.79  2005/03/27 13:10:20  qboosh
 - updated bcond desc
 

================================================================
Index: SPECS/librpcsecgss.spec
diff -u SPECS/librpcsecgss.spec:1.14 SPECS/librpcsecgss.spec:1.15
--- SPECS/librpcsecgss.spec:1.14	Wed Aug 16 21:06:51 2006
+++ SPECS/librpcsecgss.spec	Mon Nov 13 16:00:11 2006
@@ -65,7 +65,7 @@
 
 %prep
 %setup -q
-%if %{without libgssapi}
+%if !%{with libgssapi}
 %patch0 -p1
 sed -i -e 's,gssapi/gssapi\.h,gssapi.h,' include/rpcsecgss/rpc/auth_gss.h \
 	src/{authgss_prot,auth_gss,svc_auth_gss}.c
@@ -114,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.14  2006/08/16 19:06:51  qboosh
 - updated to 0.14
 

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.190 SPECS/lighttpd.spec:1.191
--- SPECS/lighttpd.spec:1.190	Tue Oct 24 16:54:33 2006
+++ SPECS/lighttpd.spec	Mon Nov 13 16:00:11 2006
@@ -826,12 +826,12 @@
 install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf
 install %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf
 
-%if %{without mysql}
+%if !%{with mysql}
 # avoid packaging dummy module
 rm -f $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
 %endif
-%if %{without deflate}
+%if !%{with deflate}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf
 %endif
 
@@ -1146,6 +1146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.191  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.190  2006/10/24 14:54:33  glen
 - libuuid-devel is always required (thx samchi)
 

================================================================
Index: SPECS/linux-fusion.spec
diff -u SPECS/linux-fusion.spec:1.6 SPECS/linux-fusion.spec:1.7
--- SPECS/linux-fusion.spec:1.6	Tue Oct 10 08:26:16 2006
+++ SPECS/linux-fusion.spec	Mon Nov 13 16:00:11 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
 
@@ -177,6 +177,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.6  2006/10/10 06:26:16  qboosh
 - updated to 3.2
 

================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.15 SPECS/linuxwacom.spec:1.16
--- SPECS/linuxwacom.spec:1.15	Sat Oct  7 21:43:28 2006
+++ SPECS/linuxwacom.spec	Mon Nov 13 16:00:11 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
 
@@ -217,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.15  2006/10/07 19:43:28  wolvverine
 - up to 0.7.5-4, clean spec
 

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.128 SPECS/lirc.spec:1.129
--- SPECS/lirc.spec:1.128	Fri Oct 13 00:40:25 2006
+++ SPECS/lirc.spec	Mon Nov 13 16:00:11 2006
@@ -903,7 +903,7 @@
 %patch0 -p1
 %patch1 -p1
 #%patch2 -p1
-%if %{without svga}
+%if !%{with svga}
 %patch3 -p1
 %endif
 %patch4 -p1
@@ -1537,6 +1537,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.128  2006/10/12 22:40:25  czarny
 - %{_alt_kernel} support
 

================================================================
Index: SPECS/lirc24.spec
diff -u SPECS/lirc24.spec:1.123 SPECS/lirc24.spec:1.124
--- SPECS/lirc24.spec:1.123	Sun Apr  9 16:42:13 2006
+++ SPECS/lirc24.spec	Mon Nov 13 16:00:11 2006
@@ -904,7 +904,7 @@
 %patch0 -p1
 %patch1 -p1
 #%patch2 -p1
-%if %{without svga}
+%if !%{with svga}
 %patch3 -p1
 %endif
 %patch4 -p1
@@ -1533,6 +1533,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.123  2006/04/09 14:42:13  kolodko
 - --with-driver=userspace
 

================================================================
Index: SPECS/macromedia-flash.spec
diff -u SPECS/macromedia-flash.spec:1.59 SPECS/macromedia-flash.spec:1.60
--- SPECS/macromedia-flash.spec:1.59	Mon Oct 30 18:28:49 2006
+++ SPECS/macromedia-flash.spec	Mon Nov 13 16:00:11 2006
@@ -69,7 +69,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 '
@@ -92,7 +92,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %post
 %{_bindir}/%{base_name}.install
 
@@ -149,7 +149,7 @@
 %files
 %defattr(644,root,root,755)
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %attr(755,root,root) %{_bindir}/%{base_name}.install
 %{_datadir}/%{base_name}
 
@@ -164,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.59  2006/10/30 17:28:49  shadzik
 - add mozilla-firefox-bin support
 - rel up

================================================================
Index: SPECS/mp1e.spec
diff -u SPECS/mp1e.spec:1.3 SPECS/mp1e.spec:1.4
--- SPECS/mp1e.spec:1.3	Mon Apr 19 01:00:59 2004
+++ SPECS/mp1e.spec	Mon Nov 13 16:00:11 2006
@@ -77,7 +77,7 @@
 %patch0 -p1
 
 rm -f macros/{alsa,as}.m4
-%if %{without alsa}
+%if !%{with alsa}
 echo 'AC_DEFUN([AM_PATH_ALSA], [$3])' > macros/alsa.m4
 %endif
 
@@ -128,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:00:11  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2004/04/18 23:00:59  qboosh
 - updated to 1.9.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-misc-qvm86.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/kernel-misc-toshbt.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/kernel-video-drm.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/kernel-video-viafb.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.779&r2=1.780&f=u
    http://cvs.pld-linux.org/SPECS/libao.spec?r1=1.61&r2=1.62&f=u
    http://cvs.pld-linux.org/SPECS/libgda.spec?r1=1.107&r2=1.108&f=u
    http://cvs.pld-linux.org/SPECS/libglade.spec?r1=1.79&r2=1.80&f=u
    http://cvs.pld-linux.org/SPECS/librpcsecgss.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.190&r2=1.191&f=u
    http://cvs.pld-linux.org/SPECS/linux-fusion.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/linuxwacom.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/lirc.spec?r1=1.128&r2=1.129&f=u
    http://cvs.pld-linux.org/SPECS/lirc24.spec?r1=1.123&r2=1.124&f=u
    http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.59&r2=1.60&f=u
    http://cvs.pld-linux.org/SPECS/mp1e.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list