SPECS: fonts-TTF-microsoft-tahoma.spec, fonts-TTF-microsoft.spec, ...

Mon Nov 13 15:57:00 CET 2006

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

---- Files affected:
SPECS:
   fonts-TTF-microsoft-tahoma.spec (1.10 -> 1.11) , fonts-TTF-microsoft.spec (1.32 -> 1.33) , fwbuilder.spec (1.38 -> 1.39) , gcc.spec (1.428 -> 1.429) , gdkxft.spec (1.59 -> 1.60) , glibc.spec (1.663 -> 1.664) , gmutoo.spec (1.3 -> 1.4) , go7007.spec (1.9 -> 1.10) , grub.spec (1.105 -> 1.106) , kadu.spec (1.168 -> 1.169) , kde-i18n.spec (1.159 -> 1.160) , kde-theme-linspireclear.spec (1.7 -> 1.8) , kdegraphics.spec (1.184 -> 1.185) , kdemultimedia.spec (1.223 -> 1.224) , kernel-isdn-fcpci.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/fonts-TTF-microsoft-tahoma.spec
diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.10 SPECS/fonts-TTF-microsoft-tahoma.spec:1.11

--- SPECS/fonts-TTF-microsoft-tahoma.spec:1.10	Sat Apr 22 20:48:19 2006
+++ SPECS/fonts-TTF-microsoft-tahoma.spec	Mon Nov 13 15:56:53 2006
@@ -48,7 +48,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 '
@@ -103,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.10  2006/04/22 18:48:19  glen
 - rel 3
 

================================================================
Index: SPECS/fonts-TTF-microsoft.spec
diff -u SPECS/fonts-TTF-microsoft.spec:1.32 SPECS/fonts-TTF-microsoft.spec:1.33
--- SPECS/fonts-TTF-microsoft.spec:1.32	Wed Jun 21 21:31:45 2006
+++ SPECS/fonts-TTF-microsoft.spec	Mon Nov 13 15:56:53 2006
@@ -81,7 +81,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 '
@@ -139,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.32  2006/06/21 19:31:45  glen
 - pure requires on fontpostinst
 

================================================================
Index: SPECS/fwbuilder.spec
diff -u SPECS/fwbuilder.spec:1.38 SPECS/fwbuilder.spec:1.39
--- SPECS/fwbuilder.spec:1.38	Fri Jul 28 23:51:52 2006
+++ SPECS/fwbuilder.spec	Mon Nov 13 15:56:53 2006
@@ -209,7 +209,7 @@
 # Without it this app uses ccache if it's found in system even if we don't
 # want it
 
-%if %{without ccache}
+%if !%{with ccache}
 grep -vi ccache configure.in > configure.in.x
 mv configure.in.x configure.in
 %endif
@@ -340,6 +340,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.38  2006/07/28 21:51:52  charles
 - updated to 2.0.12 (bugfix release)
 - STBR

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.428 SPECS/gcc.spec:1.429
--- SPECS/gcc.spec:1.428	Fri Nov 10 20:49:02 2006
+++ SPECS/gcc.spec	Mon Nov 13 15:56:53 2006
@@ -15,16 +15,16 @@
 %bcond_without	bootstrap	# omit 3-stage bootstrap
 %bcond_with	tests		# torture gcc
 
-%if %{without cxx}
+%if !%{with cxx}
 %undefine	with_java
 %undefine	with_objcxx
 %endif
 
-%if %{without objc}
+%if !%{with objc}
 %undefine	with_objcxx
 %endif
 
-%if %{without bootstrap}
+%if !%{with bootstrap}
 %undefine	with_profiling
 %endif
 
@@ -1399,6 +1399,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.429  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.428  2006/11/10 19:49:02  pluto
 - updated to 4.2.0-20061110 (rev. 118658).
 - BR: mpfr-devel >= 2.2.

================================================================
Index: SPECS/gdkxft.spec
diff -u SPECS/gdkxft.spec:1.59 SPECS/gdkxft.spec:1.60
--- SPECS/gdkxft.spec:1.59	Sun Sep  3 13:16:23 2006
+++ SPECS/gdkxft.spec	Mon Nov 13 15:56:53 2006
@@ -92,7 +92,7 @@
 %setup -q
 
 %build
-%if %{without gnome}
+%if !%{with gnome}
 cat >> acinclude.m4 <<EOF
 AC_DEFUN([AM_PATH_LIBGLADE],[
 AM_CONDITIONAL([HAVE_ORBIT],false)
@@ -183,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.59  2006/09/03 11:16:23  glen
 - strict internal deps
 

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.663 SPECS/glibc.spec:1.664
--- SPECS/glibc.spec:1.663	Sat Nov  4 01:28:14 2006
+++ SPECS/glibc.spec	Mon Nov 13 15:56:53 2006
@@ -903,7 +903,7 @@
 done
 %endif
 
-%if %{without cross}
+%if !%{with cross}
 diet %{__cc} %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
 %endif
 
@@ -933,7 +933,7 @@
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 cd ..
 
-%if %{without cross}
+%if !%{with cross}
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
 %endif
 
@@ -1055,7 +1055,7 @@
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
-%if %{without cross}
+%if !%{with cross}
 %post	-p /sbin/postshell
 /sbin/glibc-postinst /%{_lib}/%{_host_cpu}
 /sbin/ldconfig
@@ -1108,7 +1108,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
-%if %{without cross}
+%if !%{with cross}
 %attr(755,root,root) /sbin/glibc-postinst
 %endif
 %attr(755,root,root) /sbin/ldconfig
@@ -1459,6 +1459,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.664  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.663  2006/11/04 00:28:14  sparky
 - ppc-include-mathinlune replaced by better ppc-inline-fsqrt patch
 

================================================================
Index: SPECS/gmutoo.spec
diff -u SPECS/gmutoo.spec:1.3 SPECS/gmutoo.spec:1.4
--- SPECS/gmutoo.spec:1.3	Thu May 11 08:04:31 2006
+++ SPECS/gmutoo.spec	Mon Nov 13 15:56:53 2006
@@ -63,7 +63,7 @@
 
 %build
 %configure \
-%if %{without gamin}
+%if !%{with gamin}
 	--disable-monitor
 %endif
 
@@ -93,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2006/05/11 06:04:31  qboosh
 - added doc, BR: pkgconfig
 

================================================================
Index: SPECS/go7007.spec
diff -u SPECS/go7007.spec:1.9 SPECS/go7007.spec:1.10
--- SPECS/go7007.spec:1.9	Wed Apr 12 14:15:41 2006
+++ SPECS/go7007.spec	Mon Nov 13 15:56:53 2006
@@ -11,7 +11,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
 
@@ -236,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.9  2006/04/12 12:15:41  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/grub.spec
diff -u SPECS/grub.spec:1.105 SPECS/grub.spec:1.106
--- SPECS/grub.spec:1.105	Thu Sep 21 18:13:59 2006
+++ SPECS/grub.spec	Mon Nov 13 15:56:53 2006
@@ -169,7 +169,7 @@
 LDFLAGS="-static"; export LDFLAGS
 %endif
 %configure \
-%if %{without splashimage}
+%if !%{with splashimage}
 	--enable-3c503 \
 	--enable-3c507 \
 	--enable-3c509 \
@@ -258,7 +258,7 @@
 %{_mandir}/*/*
 /etc/sysconfig/rc-boot/%{name}_functions.sh
 
-%if %{without splashimage}
+%if !%{with splashimage}
 %files nb
 %defattr(644,root,root,755)
 %{_libdir}/grub/nbgrub
@@ -274,6 +274,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.105  2006/09/21 16:13:59  glen
 - cosmetics
 

================================================================
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.168 SPECS/kadu.spec:1.169
--- SPECS/kadu.spec:1.168	Sun Jan 29 13:13:37 2006
+++ SPECS/kadu.spec	Mon Nov 13 15:56:53 2006
@@ -16,7 +16,7 @@
 %bcond_without	weather		# without Weather support module
 %bcond_without	xmms		# without XMMS player support module
 
-%if %{with imiface} && %{without dcopexport}
+%if %{with imiface} && !%{with dcopexport}
 cannot build imiface without dcopexport
 %endif
 
@@ -686,6 +686,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.169  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.168  2006/01/29 12:13:37  blekot
 - rel 3
 

================================================================
Index: SPECS/kde-i18n.spec
diff -u SPECS/kde-i18n.spec:1.159 SPECS/kde-i18n.spec:1.160
--- SPECS/kde-i18n.spec:1.159	Fri Nov  3 12:06:56 2006
+++ SPECS/kde-i18n.spec	Mon Nov 13 15:56:53 2006
@@ -1663,7 +1663,7 @@
 %files base
 %defattr(644,root,root,755)
 
-%if %{without alltogether}
+%if !%{with alltogether}
 %files -f Afrikaans.lang Afrikaans
 %defattr(644,root,root,755)
 
@@ -1876,6 +1876,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.159  2006/11/03 11:06:56  glen
 - rel 1
 

================================================================
Index: SPECS/kde-theme-linspireclear.spec
diff -u SPECS/kde-theme-linspireclear.spec:1.7 SPECS/kde-theme-linspireclear.spec:1.8
--- SPECS/kde-theme-linspireclear.spec:1.7	Sat Oct  7 12:57:54 2006
+++ SPECS/kde-theme-linspireclear.spec	Mon Nov 13 15:56:53 2006
@@ -21,7 +21,7 @@
 # Source0-md5:	1e2cc6f0febf17b294d8306ccce8db51
 Source1:	http://software.linspire.com/pool-src/los/los-clear-e-icons/los-clear-e-icons_%{_icons_ver}-%{_common_ver}.linspire0.1.tar.gz
 # NoSource1-md5:	14d2ea49f2ebb47eb9690d69fcc6c7f2
-%if %{without weHaveCheckedIfTheIconsAreDistributable}
+%if !%{with weHaveCheckedIfTheIconsAreDistributable}
 NoSource:	1
 %endif
 BuildRequires:	autoconf
@@ -163,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.7  2006/10/07 10:57:54  qboosh
 - any descriptions
 

================================================================
Index: SPECS/kdegraphics.spec
diff -u SPECS/kdegraphics.spec:1.184 SPECS/kdegraphics.spec:1.185
--- SPECS/kdegraphics.spec:1.184	Thu Oct  5 00:02:29 2006
+++ SPECS/kdegraphics.spec	Mon Nov 13 15:56:53 2006
@@ -564,7 +564,7 @@
 
 %{__make} -f admin/Makefile.common cvs
 
-%if %{without kuickshow}
+%if !%{with kuickshow}
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kuickshow"
 %endif
 
@@ -918,6 +918,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.184  2006/10/04 22:02:29  adgor
 - Cleanups
 

================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.223 SPECS/kdemultimedia.spec:1.224
--- SPECS/kdemultimedia.spec:1.223	Fri Nov  3 12:06:55 2006
+++ SPECS/kdemultimedia.spec	Mon Nov 13 15:56:53 2006
@@ -279,7 +279,7 @@
 iTunes(R) or RealOne(R). As is typical with many jukebox applications,
 JuK allows you to edit the "tags" of the audio files, and manage your
 collection and playlists.
-%if %{without gstreamer}
+%if !%{with gstreamer}
 
 Gstreamer support in this version has been disabled. To reenable it
 please repuild the source rpm with '--with gstreamer' option.
@@ -290,7 +290,7 @@
 KDE podobny do iTunes(R) lub RealOne(R). Podobnie jak wiele innych
 tego typu aplikacji, JuK umożliwia modyfikowanie znaczników plików
 dźwiękowych i zarządzanie kolekcją oraz playlistami.
-%if %{without gstreamer}
+%if !%{with gstreamer}
 
 Obsługa bibliotek gstreamer została wyłączona w tej wersji pakietu. Aby 
 ją uaktywnić, należy przebudować pakiet źródłowy (.src.rpm) z parametrem 
@@ -963,6 +963,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.224  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.223  2006/11/03 11:06:55  glen
 - rel 1
 

================================================================
Index: SPECS/kernel-isdn-fcpci.spec
diff -u SPECS/kernel-isdn-fcpci.spec:1.5 SPECS/kernel-isdn-fcpci.spec:1.6
--- SPECS/kernel-isdn-fcpci.spec:1.5	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-isdn-fcpci.spec	Mon Nov 13 15:56:53 2006
@@ -9,7 +9,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
 %define		sub_ver	07
@@ -195,6 +195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/11/13 14:56:53  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.5  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft-tahoma.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/fwbuilder.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.428&r2=1.429&f=u
    http://cvs.pld-linux.org/SPECS/gdkxft.spec?r1=1.59&r2=1.60&f=u
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.663&r2=1.664&f=u
    http://cvs.pld-linux.org/SPECS/gmutoo.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/go7007.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/grub.spec?r1=1.105&r2=1.106&f=u
    http://cvs.pld-linux.org/SPECS/kadu.spec?r1=1.168&r2=1.169&f=u
    http://cvs.pld-linux.org/SPECS/kde-i18n.spec?r1=1.159&r2=1.160&f=u
    http://cvs.pld-linux.org/SPECS/kde-theme-linspireclear.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/kdegraphics.spec?r1=1.184&r2=1.185&f=u
    http://cvs.pld-linux.org/SPECS/kdemultimedia.spec?r1=1.223&r2=1.224&f=u
    http://cvs.pld-linux.org/SPECS/kernel-isdn-fcpci.spec?r1=1.5&r2=1.6&f=u

