SPECS: w32codec.spec, wanpipe.spec, wine.spec, xemacs.spec, xfspro...

sparky sparky at pld-linux.org
Mon Nov 13 16:06:08 CET 2006


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

---- Files affected:
SPECS:
   w32codec.spec (1.87 -> 1.88) , wanpipe.spec (1.34 -> 1.35) , wine.spec (1.256 -> 1.257) , xemacs.spec (1.151 -> 1.152) , xfsprogs.spec (1.83 -> 1.84) , xorg-driver-video-fglrx.spec (1.18 -> 1.19) , zaptel-alt.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/w32codec.spec
diff -u SPECS/w32codec.spec:1.87 SPECS/w32codec.spec:1.88
--- SPECS/w32codec.spec:1.87	Wed Nov  8 20:10:42 2006
+++ SPECS/w32codec.spec	Mon Nov 13 16:06:00 2006
@@ -67,7 +67,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 '
@@ -86,7 +86,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa
 %endif
 
-%if %{without license_agreement}
+%if !%{with license_agreement}
 %post
 %{_bindir}/%{base_name}.install
 %endif
@@ -109,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.87  2006/11/08 19:10:42  witekfl
 - updated to 20061022
 

================================================================
Index: SPECS/wanpipe.spec
diff -u SPECS/wanpipe.spec:1.34 SPECS/wanpipe.spec:1.35
--- SPECS/wanpipe.spec:1.34	Mon Oct  9 22:17:37 2006
+++ SPECS/wanpipe.spec	Mon Nov 13 16:06:00 2006
@@ -5,7 +5,7 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# don't build SMP module
 #
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -222,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.34  2006/10/09 20:17:37  glen
 - make -j1
 

================================================================
Index: SPECS/wine.spec
diff -u SPECS/wine.spec:1.256 SPECS/wine.spec:1.257
--- SPECS/wine.spec:1.256	Sat Nov 11 03:17:35 2006
+++ SPECS/wine.spec	Mon Nov 13 16:06:00 2006
@@ -20,7 +20,7 @@
 # thus requires rebuild after change of any of the above.
 #
 # JACK requires ALSA
-%if %{without alsa}
+%if !%{with alsa}
 %undefine	with_jack
 %endif
 Summary:	Program that lets you launch Win applications
@@ -471,6 +471,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.257  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.256  2006/11/11 02:17:35  wolf
 - 0.9.25
 

================================================================
Index: SPECS/xemacs.spec
diff -u SPECS/xemacs.spec:1.151 SPECS/xemacs.spec:1.152
--- SPECS/xemacs.spec:1.151	Tue Nov  7 23:31:36 2006
+++ SPECS/xemacs.spec	Mon Nov 13 16:06:00 2006
@@ -292,7 +292,7 @@
 	--without-ldap \
 	--without-dragndrop \
 	--without-msw \
-%if %{without pdump}
+%if !%{with pdump}
 	--pdump=no
 %endif
 
@@ -487,6 +487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.151  2006/11/07 22:31:36  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly
 

================================================================
Index: SPECS/xfsprogs.spec
diff -u SPECS/xfsprogs.spec:1.83 SPECS/xfsprogs.spec:1.84
--- SPECS/xfsprogs.spec:1.83	Mon Oct 30 21:25:29 2006
+++ SPECS/xfsprogs.spec	Mon Nov 13 16:06:00 2006
@@ -169,7 +169,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%if %{without static}
+%if !%{with static}
 %attr(755,root,root) %{_libexecdir}/lib*.so
 %{_libexecdir}/lib*.la
 %endif
@@ -187,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.83  2006/10/30 20:25:29  qboosh
 - updated to 2.8.16, updated pl.po-update patch, added gettext patch
 

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.18 SPECS/xorg-driver-video-fglrx.spec:1.19
--- SPECS/xorg-driver-video-fglrx.spec:1.18	Mon Nov 13 13:45:53 2006
+++ SPECS/xorg-driver-video-fglrx.spec	Mon Nov 13 16:06:00 2006
@@ -9,7 +9,7 @@
 
 %define		x11ver		x710
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine with_dist_kernel
 %endif
 
@@ -267,6 +267,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.18  2006/11/13 12:45:53  sparky
 - %{_alt_kernel} support
 - use %build_kernel_modules, %install_kernel_modules (not tested)

================================================================
Index: SPECS/zaptel-alt.spec
diff -u SPECS/zaptel-alt.spec:1.3 SPECS/zaptel-alt.spec:1.4
--- SPECS/zaptel-alt.spec:1.3	Wed Apr 12 14:15:40 2006
+++ SPECS/zaptel-alt.spec	Mon Nov 13 16:06:00 2006
@@ -159,7 +159,7 @@
 %endif
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 	touch include/config/MARKER
-%if %{without dist_kernel}
+%if !%{with dist_kernel}
 	mkdir -p scripts/{basic,mod}
 	ln -sf %{_kernelsrcdir}/scripts/mod/modpost scripts/mod/modpost
 	ln -sf %{_kernelsrcdir}/scripts/basic/fixdep scripts/basic/fixdep
@@ -279,6 +279,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:06:00  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.87&r2=1.88&f=u
    http://cvs.pld-linux.org/SPECS/wanpipe.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SPECS/wine.spec?r1=1.256&r2=1.257&f=u
    http://cvs.pld-linux.org/SPECS/xemacs.spec?r1=1.151&r2=1.152&f=u
    http://cvs.pld-linux.org/SPECS/xfsprogs.spec?r1=1.83&r2=1.84&f=u
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-fglrx.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/zaptel-alt.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list