SPECS: db4.3.spec, db4.4.spec, db4.5.spec, dosemu.spec, e2fsprogs....

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

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

---- Files affected:
SPECS:
   db4.3.spec (1.14 -> 1.15) , db4.4.spec (1.5 -> 1.6) , db4.5.spec (1.4 -> 1.5) , dosemu.spec (1.120 -> 1.121) , e2fsprogs.spec (1.153 -> 1.154) , eclipse-swt.spec (1.7 -> 1.8) , ekg2.spec (1.72 -> 1.73) , em8300.spec (1.43 -> 1.44) , emacs.spec (1.78 -> 1.79) , emacsen-gnus-pkg.spec (1.6 -> 1.7) , emotion.spec (1.12 -> 1.13) , evidence.spec (1.4 -> 1.5) , fasm.spec (1.6 -> 1.7) , fbida.spec (1.9 -> 1.10) , fonts-TTF-Bitstream-Cyberfonts.spec (1.6 -> 1.7) , fonts-TTF-Microsoft-ArialUnicode.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/db4.3.spec
diff -u SPECS/db4.3.spec:1.14 SPECS/db4.3.spec:1.15
--- SPECS/db4.3.spec:1.14	Tue Dec 13 19:01:46 2005
+++ SPECS/db4.3.spec	Mon Nov 13 15:54:48 2006
@@ -237,7 +237,7 @@
 %prep
 %setup -q -n db-%{version}
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -477,6 +477,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.14  2005/12/13 18:01:46  glen
 - adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
 

================================================================
Index: SPECS/db4.4.spec
diff -u SPECS/db4.4.spec:1.5 SPECS/db4.4.spec:1.6
--- SPECS/db4.4.spec:1.5	Wed Apr 19 19:41:20 2006
+++ SPECS/db4.4.spec	Mon Nov 13 15:54:48 2006
@@ -243,7 +243,7 @@
 %patch0 -p0
 %patch1 -p0
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -491,6 +491,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.5  2006/04/19 17:41:20  witekfl
 - IMHO better handling of without_static_libs
 

================================================================
Index: SPECS/db4.5.spec
diff -u SPECS/db4.5.spec:1.4 SPECS/db4.5.spec:1.5
--- SPECS/db4.5.spec:1.4	Mon Oct 30 20:06:15 2006
+++ SPECS/db4.5.spec	Mon Nov 13 15:54:48 2006
@@ -243,7 +243,7 @@
 %prep
 %setup -q -n db-%{version}
 
-%if %{without nptl}
+%if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -494,6 +494,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.4  2006/10/30 19:06:15  pluto
 - release 2.
 

================================================================
Index: SPECS/dosemu.spec
diff -u SPECS/dosemu.spec:1.120 SPECS/dosemu.spec:1.121
--- SPECS/dosemu.spec:1.120	Fri Oct 20 07:58:31 2006
+++ SPECS/dosemu.spec	Mon Nov 13 15:54:48 2006
@@ -35,7 +35,7 @@
 URL:		http://www.dosemu.org/
 BuildRequires:	SDL-devel
 %if %{with x}
-%if %{without AC}
+%if !%{with AC}
 BuildRequires:	xorg-lib-libX11-devel
 %{?with_static:BuildRequires:	xorg-lib-libX11-static}
 %endif
@@ -276,6 +276,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.120  2006/10/20 05:58:31  pascalek
 - updated to 1.3.3.1 svn, AC bcond
 

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.153 SPECS/e2fsprogs.spec:1.154
--- SPECS/e2fsprogs.spec:1.153	Fri Oct 20 20:19:51 2006
+++ SPECS/e2fsprogs.spec	Mon Nov 13 15:54:48 2006
@@ -667,7 +667,7 @@
 %files devel
 %defattr(644,root,root,755)
 %doc doc/libblkid.txt
-%if %{without allstatic}
+%if !%{with allstatic}
 %attr(755,root,root) %{_libdir}/libblkid.so
 %attr(755,root,root) %{_libdir}/libe2p.so
 %attr(755,root,root) %{_libdir}/libext2fs.so
@@ -748,6 +748,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.153  2006/10/20 18:19:51  glen
 - package /etc/blkid.tab
 

================================================================
Index: SPECS/eclipse-swt.spec
diff -u SPECS/eclipse-swt.spec:1.7 SPECS/eclipse-swt.spec:1.8
--- SPECS/eclipse-swt.spec:1.7	Thu Jun 22 12:02:22 2006
+++ SPECS/eclipse-swt.spec	Mon Nov 13 15:54:48 2006
@@ -89,7 +89,7 @@
 
 patch -p0 < %{PATCH0}
 patch -p0 < %{PATCH1}
-%if %{without gnome}
+%if !%{with gnome}
 patch -p0 < %{PATCH2}
 %endif
 
@@ -187,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.7  2006/06/22 10:02:22  adamg
 - updated to 3.1.2
 - reversed cairo bcond for now

================================================================
Index: SPECS/ekg2.spec
diff -u SPECS/ekg2.spec:1.72 SPECS/ekg2.spec:1.73
--- SPECS/ekg2.spec:1.72	Sun Oct  8 19:56:25 2006
+++ SPECS/ekg2.spec	Mon Nov 13 15:54:48 2006
@@ -22,7 +22,7 @@
 %define		_snap 20060831
 %endif
 
-%if %{without jabber}
+%if !%{with jabber}
 %undefine with_gnutls
 %endif
 
@@ -406,6 +406,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.72  2006/10/08 17:56:25  leafnode
 - new URL
 

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.43 SPECS/em8300.spec:1.44
--- SPECS/em8300.spec:1.43	Wed Sep  6 15:48:33 2006
+++ SPECS/em8300.spec	Mon Nov 13 15:54:48 2006
@@ -14,7 +14,7 @@
 %undefine	with_kernel
 %endif
 
-%if %{without kernel}
+%if !%{with kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -266,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.43  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 

================================================================
Index: SPECS/emacs.spec
diff -u SPECS/emacs.spec:1.78 SPECS/emacs.spec:1.79
--- SPECS/emacs.spec:1.78	Sat Apr  1 14:19:53 2006
+++ SPECS/emacs.spec	Mon Nov 13 15:54:48 2006
@@ -378,7 +378,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-%if %{without gnus}
+%if !%{with gnus}
 rm -rf $RPM_BUILD_ROOT%{_infodir}/{emacs-mime,gnus,message,pgg,sieve}* \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/%{sver}/lisp/gnus \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/%{sver}/etc/gnus*
@@ -633,6 +633,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.78  2006/04/01 12:19:53  qboosh
 - sorted BRs
 

================================================================
Index: SPECS/emacsen-gnus-pkg.spec
diff -u SPECS/emacsen-gnus-pkg.spec:1.6 SPECS/emacsen-gnus-pkg.spec:1.7
--- SPECS/emacsen-gnus-pkg.spec:1.6	Mon Aug  1 21:29:54 2005
+++ SPECS/emacsen-gnus-pkg.spec	Mon Nov 13 15:54:48 2006
@@ -154,7 +154,7 @@
 	--with-etcdir=%{_datadir}/%{_the_name}
 %{__make}
 
-%if %{without emacs} && %{with pdf_doc}
+%if !%{with emacs} && %{with pdf_doc}
 %{__make} -C texi pdf
 %endif
 
@@ -229,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.6  2005/08/01 19:29:54  speedy
 - s/startls/starttls
 - release 3, STBR

================================================================
Index: SPECS/emotion.spec
diff -u SPECS/emotion.spec:1.12 SPECS/emotion.spec:1.13
--- SPECS/emotion.spec:1.12	Tue Jun 27 03:17:36 2006
+++ SPECS/emotion.spec	Mon Nov 13 15:54:48 2006
@@ -5,7 +5,7 @@
 %bcond_without	xine		# don't build xine decoder
 %bcond_without	static_libs	# don't build static library
 #
-%if %{without gstreamer} && %{without xine}
+%if !%{with gstreamer} && !%{with xine}
 error at last one backend must be enabled
 %endif
 #
@@ -159,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.12  2006/06/27 01:17:36  sparky
 - 20060625 snap, gstreamer reqs updated
 

================================================================
Index: SPECS/evidence.spec
diff -u SPECS/evidence.spec:1.4 SPECS/evidence.spec:1.5
--- SPECS/evidence.spec:1.4	Sat Nov 12 00:53:00 2005
+++ SPECS/evidence.spec	Mon Nov 13 15:54:48 2006
@@ -195,7 +195,7 @@
 	--enable-xds			\
 	--enable-x			\
 	--disable-backend-gnomevfs2 %{?0:want's build}	\
-%if %{without kio}
+%if !%{with kio}
 	--disable-backend-kio		\
 %else
 	--enable-backend-kio		\
@@ -307,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.4  2005/11/11 23:53:00  megabajt
 - BR: autoconf, automake
 

================================================================
Index: SPECS/fasm.spec
diff -u SPECS/fasm.spec:1.6 SPECS/fasm.spec:1.7
--- SPECS/fasm.spec:1.6	Mon May  8 01:44:55 2006
+++ SPECS/fasm.spec	Mon Nov 13 15:54:48 2006
@@ -13,7 +13,7 @@
 Source0:	http://flatassembler.net/%{name}-%{version}.tgz
 # Source0-md5:	f5cb8e91bfc53d0a1102790a64c80153
 URL:		http://flatassembler.net/
-%if %{without bootstrap}
+%if !%{with bootstrap}
 BuildRequires:	fasm
 %endif
 ExclusiveArch:	%{ix86}
@@ -45,7 +45,7 @@
 %setup -q -n %{name}
 
 %build
-%if %{without bootstrap}
+%if !%{with bootstrap}
 ASM=%{name}
 %else
 ASM=../../%{name}
@@ -73,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.6  2006/05/07 23:44:55  charles
 - updated to 1.66
 - bootstrap bcond inverted

================================================================
Index: SPECS/fbida.spec
diff -u SPECS/fbida.spec:1.9 SPECS/fbida.spec:1.10
--- SPECS/fbida.spec:1.9	Sun Aug 27 21:33:41 2006
+++ SPECS/fbida.spec	Mon Nov 13 15:54:48 2006
@@ -13,7 +13,7 @@
 %bcond_without	sane	# without SANE scanning support (in ida)
 %bcond_without	tiff	# without TIFF images support
 #
-%if %{without motif}
+%if !%{with motif}
 # SANE used only in ida
 %undefine	with_sane
 %endif
@@ -182,6 +182,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.9  2006/08/27 19:33:41  qboosh
 - updated to 2.06, added CVE note to changelog rev. 1.6
 

================================================================
Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec
diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.6 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.7
--- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.6	Mon Jan  2 12:01:33 2006
+++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec	Mon Nov 13 15:54:48 2006
@@ -43,7 +43,7 @@
 
 %description
 Bitstream Cyberfonts True Type font.
-%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 one of the following
@@ -54,7 +54,7 @@
 
 %description -l pl
 Font True Type Cyberfonts firmy Bitstream.
-%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:
@@ -75,7 +75,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 '
@@ -132,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.6  2006/01/02 11:01:33  glen
 - run script in %post
 

================================================================
Index: SPECS/fonts-TTF-Microsoft-ArialUnicode.spec
diff -u SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.7 SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.8
--- SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.7	Mon Jan  2 12:01:33 2006
+++ SPECS/fonts-TTF-Microsoft-ArialUnicode.spec	Mon Nov 13 15:54:48 2006
@@ -36,7 +36,7 @@
 
 %description
 Microsoft Arial Unicode True Type font.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 License issues made us not to include inherent files into this package
 by default (it probably requires MS Office license). If you want to
 create full working package please build it with one of the following
@@ -47,7 +47,7 @@
 
 %description -l pl
 Font True Type Arial Unicode firmy Microsoft.
-%if %{without license_agreement}
+%if !%{with license_agreement}
 Kwestie licencji zmusiły nas do niedołączania do tego pakietu istotnych
 plików (prawdopodobnie wymaga licencji na MS Office). Jeśli chcesz stworzyć
 w pełni funkcjonalny pakiet, zbuduj go za pomocą polecenia:
@@ -63,7 +63,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 '
@@ -117,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 14:54:48  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.7  2006/01/02 11:01:33  glen
 - run script in %post
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db4.3.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/db4.4.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/db4.5.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/dosemu.spec?r1=1.120&r2=1.121&f=u
    http://cvs.pld-linux.org/SPECS/e2fsprogs.spec?r1=1.153&r2=1.154&f=u
    http://cvs.pld-linux.org/SPECS/eclipse-swt.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/ekg2.spec?r1=1.72&r2=1.73&f=u
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/emacs.spec?r1=1.78&r2=1.79&f=u
    http://cvs.pld-linux.org/SPECS/emacsen-gnus-pkg.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/evidence.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/fasm.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/fbida.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/fonts-TTF-Microsoft-ArialUnicode.spec?r1=1.7&r2=1.8&f=u

More information about the pld-cvs-commit mailing list