SPECS: redhat-artwork.spec, rlocate.spec, samba.spec, sethdlc.spec...

sparky sparky at pld-linux.org
Mon Nov 13 16:04:18 CET 2006 

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

---- Files affected:
SPECS:
   redhat-artwork.spec (1.45 -> 1.46) , rlocate.spec (1.40 -> 1.41) , samba.spec (1.341 -> 1.342) , sethdlc.spec (1.16 -> 1.17) , shadow.spec (1.120 -> 1.121) , slmodem.spec (1.28 -> 1.29) , soundtracker.spec (1.35 -> 1.36) , sqlite3.spec (1.27 -> 1.28) , subversion.spec (1.175 -> 1.176) , tremulous.spec (1.4 -> 1.5) , unionfs.spec (1.22 -> 1.23) , util-linux.spec (1.280 -> 1.281) 

---- Diffs:

================================================================
Index: SPECS/redhat-artwork.spec
diff -u SPECS/redhat-artwork.spec:1.45 SPECS/redhat-artwork.spec:1.46
--- SPECS/redhat-artwork.spec:1.45	Thu Aug 24 00:58:17 2006
+++ SPECS/redhat-artwork.spec	Mon Nov 13 16:04:12 2006
@@ -195,7 +195,7 @@
 #%patch2 -p1
 
 %build
-%if %{without kde}
+%if !%{with kde}
 sed -i -e "s,kde ,," art/Makefile.am
 rm -rf art/kde/kwin/Bluecurve/configure.in.in
 %endif
@@ -310,6 +310,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.45  2006/08/23 22:58:17  havner
 - BR: xcursorgen
 

================================================================
Index: SPECS/rlocate.spec
diff -u SPECS/rlocate.spec:1.40 SPECS/rlocate.spec:1.41
--- SPECS/rlocate.spec:1.40	Wed Jul 26 17:50:56 2006
+++ SPECS/rlocate.spec	Mon Nov 13 16:04:12 2006
@@ -12,7 +12,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
 #
@@ -118,7 +118,7 @@
 
 %if %{with kernel}
 
-%if %{without dist_kernel}
+%if !%{with dist_kernel}
 cat 2>&1 <<'EOF'
 WARNING:
 - CONFIG_SECURITY must be enabled in the kernel config,
@@ -261,6 +261,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.40  2006/07/26 15:50:56  glen
 - remove extra unneeded slash
 

================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.341 SPECS/samba.spec:1.342
--- SPECS/samba.spec:1.341	Fri Nov 10 10:38:46 2006
+++ SPECS/samba.spec	Mon Nov 13 16:04:12 2006
@@ -10,7 +10,7 @@
 %bcond_without	python		# without python libs/utils
 
 # ADS requires krb5 and LDAP
-%if %{without krb5} || %{without ldap}
+%if !%{with krb5} || !%{with ldap}
 %undefine	with_ads
 %endif
 %define		vscan_version 0.3.6b
@@ -1456,6 +1456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.342  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.341  2006/11/10 09:38:46  qboosh
 - release 2
 

================================================================
Index: SPECS/sethdlc.spec
diff -u SPECS/sethdlc.spec:1.16 SPECS/sethdlc.spec:1.17
--- SPECS/sethdlc.spec:1.16	Tue Aug  8 16:38:10 2006
+++ SPECS/sethdlc.spec	Mon Nov 13 16:04:12 2006
@@ -40,7 +40,7 @@
 %{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}"\
-%if %{without tahoe}
+%if !%{with tahoe}
 	INCLUDES=""
 %endif
 
@@ -81,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.16  2006/08/08 14:38:10  sparky
 - mass attack: s/%patch /%patch0 / -- usefull for overloaded %patch macro
 

================================================================
Index: SPECS/shadow.spec
diff -u SPECS/shadow.spec:1.120 SPECS/shadow.spec:1.121
--- SPECS/shadow.spec:1.120	Sat Nov 11 17:51:23 2006
+++ SPECS/shadow.spec	Mon Nov 13 16:04:12 2006
@@ -268,7 +268,7 @@
 # what's this for?
 echo '.so newgrp.1' > $RPM_BUILD_ROOT%{_mandir}/it/man1/sg.1
 
-%if %{without shared}
+%if !%{with shared}
 # invalid static library
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
@@ -649,6 +649,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.120  2006/11/11 16:51:23  glen
 - 4.0.18.1
 

================================================================
Index: SPECS/slmodem.spec
diff -u SPECS/slmodem.spec:1.28 SPECS/slmodem.spec:1.29
--- SPECS/slmodem.spec:1.28	Tue Sep 26 14:52:31 2006
+++ SPECS/slmodem.spec	Mon Nov 13 16:04:12 2006
@@ -9,7 +9,7 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without dist_kernel}
+%if !%{with dist_kernel}
 %undefine with_smp
 %endif
 
@@ -280,6 +280,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.28  2006/09/26 12:52:31  shadzik
 - fix Source0 and %setup
 

================================================================
Index: SPECS/soundtracker.spec
diff -u SPECS/soundtracker.spec:1.35 SPECS/soundtracker.spec:1.36
--- SPECS/soundtracker.spec:1.35	Tue Nov  7 23:30:06 2006
+++ SPECS/soundtracker.spec	Mon Nov 13 16:04:12 2006
@@ -9,7 +9,7 @@
 %bcond_with	jack	# JACK support (requires update for current JACK API)
 %bcond_with	gnome	# GNOME 1.x-based GUI instead of plain GTK+1
 #
-%if %{without alsa}
+%if !%{with alsa}
 %undefine	with_jack
 %endif
 Summary:	Soundtracker - music editor for xm/mod formats
@@ -108,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.35  2006/11/07 22:30:06  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly
 

================================================================
Index: SPECS/sqlite3.spec
diff -u SPECS/sqlite3.spec:1.27 SPECS/sqlite3.spec:1.28
--- SPECS/sqlite3.spec:1.27	Wed Nov  8 10:55:00 2006
+++ SPECS/sqlite3.spec	Mon Nov 13 16:04:12 2006
@@ -35,7 +35,7 @@
 
 # disabling tcl currently breaks making test target,
 # some hack in Makefile needs to be done
-%if %{without tcl}
+%if !%{with tcl}
 %undefine	with_tests
 %endif
 
@@ -221,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.27  2006/11/08 09:55:00  bartowl
 - up to 3.3.8, tested, STBR
 

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.175 SPECS/subversion.spec:1.176
--- SPECS/subversion.spec:1.175	Wed Nov  8 14:43:21 2006
+++ SPECS/subversion.spec	Mon Nov 13 16:04:12 2006
@@ -297,7 +297,7 @@
 	--without-apxs \
 	--with-berkeley-db=%{_includedir}/db4:%{_libdir} \
 %endif
-%if %{without python} && %{without perl}
+%if !%{with python} && !%{with perl}
 	--without-swig \
 %endif
 %endif
@@ -308,7 +308,7 @@
 
 %{__make} -j1
 
-%if %{without net_client_only}
+%if !%{with net_client_only}
 # python
 %if %{with python}
 %{__make} swig-py \
@@ -334,7 +334,7 @@
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
 %{__make} install -j1 \
-%if %{without net_client_only} && %{with python}
+%if !%{with net_client_only} && %{with python}
 	install-swig-py \
 %endif
 	APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
@@ -342,7 +342,7 @@
 	swig_pydir=%{py_sitedir}/libsvn \
 	swig_pydir_extra=%{py_sitedir}/svn
 
-%if %{without net_client_only} && %{with perl}
+%if !%{with net_client_only} && %{with perl}
 %{__make} install-swig-pl-lib \
 	DESTDIR=$RPM_BUILD_ROOT
 odir=$(pwd)
@@ -361,7 +361,7 @@
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
 %endif
 
-%if %{without net_client_only}
+%if !%{with net_client_only}
 install tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
 %if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -417,7 +417,7 @@
 %doc tools/xslt/*
 %attr(755,root,root) %{_bindir}/svn*
 %exclude %{_bindir}/svnserve
-%if %{without net_client_only}
+%if !%{with net_client_only}
 %exclude %{_bindir}/svn-hot-backup
 %endif
 %{_mandir}/man1/*
@@ -447,7 +447,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%if %{without net_client_only}
+%if !%{with net_client_only}
 %files svnserve
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/svnserve
@@ -515,6 +515,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.175  2006/11/08 13:43:21  arekm
 - fix neon detection
 

================================================================
Index: SPECS/tremulous.spec
diff -u SPECS/tremulous.spec:1.4 SPECS/tremulous.spec:1.5
--- SPECS/tremulous.spec:1.4	Fri Sep  8 20:03:19 2006
+++ SPECS/tremulous.spec	Mon Nov 13 16:04:12 2006
@@ -190,7 +190,7 @@
 BUILD_SERVER	= 1
 BUILD_GAME_SO	= 1
 BUILD_GAME_QVM	= 0
-%if %{without openal}
+%if !%{with openal}
 USE_OPENAL	= 0
 %endif
 EOF
@@ -288,6 +288,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.4  2006/09/08 18:03:19  glen
 - rel 2 (rebuild with fixed %useradd/%groupadd macros)
 

================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.22 SPECS/unionfs.spec:1.23
--- SPECS/unionfs.spec:1.22	Thu Sep 28 21:11:55 2006
+++ SPECS/unionfs.spec	Mon Nov 13 16:04:12 2006
@@ -10,7 +10,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	vserver		# build with vserver patches
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -200,6 +200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.22  2006/09/28 19:11:55  glen
 - unionfs-1.2 is for 2.6.16 kernels
 

================================================================
Index: SPECS/util-linux.spec
diff -u SPECS/util-linux.spec:1.280 SPECS/util-linux.spec:1.281
--- SPECS/util-linux.spec:1.280	Fri Nov  3 23:52:00 2006
+++ SPECS/util-linux.spec	Mon Nov 13 16:04:12 2006
@@ -1047,7 +1047,7 @@
 %lang(ja) %{_mandir}/ja/man8/tunelp.8*
 %lang(pl) %{_mandir}/pl/man8/tunelp.8*
 
-%if %{without uClibc}
+%if !%{with uClibc}
 %files -n login
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/login
@@ -1073,7 +1073,7 @@
 %lang(es) %{_mandir}/es/man8/agetty.8*
 %lang(ja) %{_mandir}/ja/man8/agetty.8*
 
-%if %{without uClibc}
+%if !%{with uClibc}
 %files -n rawdevices
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/raw
@@ -1090,6 +1090,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.281  2006/11/13 15:04:12  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.280  2006/11/03 22:52:00  zbyniu
 - bcond without selinux added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/redhat-artwork.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.341&r2=1.342&f=u
    http://cvs.pld-linux.org/SPECS/sethdlc.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/shadow.spec?r1=1.120&r2=1.121&f=u
    http://cvs.pld-linux.org/SPECS/slmodem.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/soundtracker.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/sqlite3.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.175&r2=1.176&f=u
    http://cvs.pld-linux.org/SPECS/tremulous.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/util-linux.spec?r1=1.280&r2=1.281&f=u

More information about the pld-cvs-commit mailing list