SPECS: munin.spec, mysql.spec, mythplugins.spec, netpbm.spec, ntfs...

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

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

---- Files affected:
SPECS:
   munin.spec (1.39 -> 1.40) , mysql.spec (1.350 -> 1.351) , mythplugins.spec (1.30 -> 1.31) , netpbm.spec (1.76 -> 1.77) , ntfsprogs.spec (1.53 -> 1.54) , nurbs++.spec (1.37 -> 1.38) , nuvtools.spec (1.3 -> 1.4) , openoffice.org.spec (1.620 -> 1.621) , pam.spec (1.243 -> 1.244) , pcmciautils.spec (1.7 -> 1.8) , perl-Net-DNS.spec (1.74 -> 1.75) , php.spec (1.607 -> 1.608) , poldek.spec (1.251 -> 1.252) , povray.spec (1.54 -> 1.55) , qt.spec (1.362 -> 1.363) , qt4.spec (1.110 -> 1.111) , quake3.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/munin.spec
diff -u SPECS/munin.spec:1.39 SPECS/munin.spec:1.40
--- SPECS/munin.spec:1.39	Fri Nov 10 17:49:04 2006
+++ SPECS/munin.spec	Mon Nov 13 16:01:54 2006
@@ -212,7 +212,7 @@
 %{perl_vendorlib}/Munin/Plugin.pm
 %dir %{_datadir}/munin/plugins
 %attr(755,root,root) %{_datadir}/munin/plugins/*
-%if %{without sybase}
+%if !%{with sybase}
 %exclude %{_datadir}/munin/plugins/sybase_space
 %endif
 %dir %attr(770,munin,munin) /var/lib/munin/plugin-state
@@ -226,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.39  2006/11/10 16:49:04  baggins
 - updated to 1.3.3
 

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.350 SPECS/mysql.spec:1.351
--- SPECS/mysql.spec:1.350	Mon Oct 30 20:19:20 2006
+++ SPECS/mysql.spec	Mon Nov 13 16:01:54 2006
@@ -542,14 +542,14 @@
 touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update}
 
 # remove innodb directives from mysqld.conf if mysqld is configured without
-%if %{without innodb}
+%if !%{with innodb}
 	echo "BASE_TABLETYPE=MyISAM" >> $RPM_BUILD_ROOT/etc/sysconfig/mysql
 	cp mysqld.conf mysqld.tmp
 	awk 'BEGIN { RS="\n\n" } !/innodb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
 %endif
 
 # remove berkeley-db directives from mysqld.conf if mysqld is configured without
-%if %{without bdb}
+%if !%{with bdb}
 	cp mysqld.conf mysqld.tmp
 	awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
 %endif
@@ -900,6 +900,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.351  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.350  2006/10/30 19:19:20  glen
 - 5.0.27 (fixes ABI incompatability introduced in 5.0.26)
 

================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.30 SPECS/mythplugins.spec:1.31
--- SPECS/mythplugins.spec:1.30	Sat Oct  7 15:43:39 2006
+++ SPECS/mythplugins.spec	Mon Nov 13 16:01:54 2006
@@ -16,7 +16,7 @@
 %bcond_without	mythweather	# disable building mythgallery plugin
 %bcond_without	mythweb		# disable building mythgallery plugin
 #
-%if %{without binary}
+%if !%{with binary}
 %undefine	with_mytharchive
 %undefine	with_mythbrowser
 %undefine	with_mythcontrols
@@ -698,6 +698,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.30  2006/10/07 13:43:39  qboosh
 - pl for mytharchive
 

================================================================
Index: SPECS/netpbm.spec
diff -u SPECS/netpbm.spec:1.76 SPECS/netpbm.spec:1.77
--- SPECS/netpbm.spec:1.76	Tue Sep 12 10:54:34 2006
+++ SPECS/netpbm.spec	Mon Nov 13 16:01:54 2006
@@ -214,7 +214,7 @@
 
 libX11.so
 
-%if %{without svga}
+%if !%{with svga}
 none
 %else
 %if "%{_lib}" != "lib"
@@ -295,6 +295,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.76  2006/09/12 08:54:34  qboosh
 - updated to 10.34, removed obsolete link patch
 

================================================================
Index: SPECS/ntfsprogs.spec
diff -u SPECS/ntfsprogs.spec:1.53 SPECS/ntfsprogs.spec:1.54
--- SPECS/ntfsprogs.spec:1.53	Thu Jun 22 07:45:12 2006
+++ SPECS/ntfsprogs.spec	Mon Nov 13 16:01:54 2006
@@ -133,7 +133,7 @@
 %patch1 -p1
 %patch2 -p1
 
-%if %{without crypto}
+%if !%{with crypto}
 echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > fake-am_path_libgcrypt.m4
 echo 'AC_DEFUN([AM_PATH_LIBGNUTLS],[:])' > fake-am_path_libgnutls.m4
 %endif
@@ -227,6 +227,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.53  2006/06/22 05:45:12  qboosh
 - package ntfscmp
 

================================================================
Index: SPECS/nurbs++.spec
diff -u SPECS/nurbs++.spec:1.37 SPECS/nurbs++.spec:1.38
--- SPECS/nurbs++.spec:1.37	Sat Apr 15 20:25:49 2006
+++ SPECS/nurbs++.spec	Mon Nov 13 16:01:54 2006
@@ -85,7 +85,7 @@
 %{__aclocal} -I config
 %{__autoconf}
 %{__automake}
-%if %{without cppunit}
+%if !%{with cppunit}
 export has_cppunit=no
 %endif
 %configure \
@@ -136,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.37  2006/04/15 18:25:49  qboosh
 - dropped gcc33 patch
 

================================================================
Index: SPECS/nuvtools.spec
diff -u SPECS/nuvtools.spec:1.3 SPECS/nuvtools.spec:1.4
--- SPECS/nuvtools.spec:1.3	Fri Nov 25 20:34:48 2005
+++ SPECS/nuvtools.spec	Mon Nov 13 16:01:54 2006
@@ -51,7 +51,7 @@
 %endif
 
 %build
-%if %{without system_ffmpeg}
+%if !%{with system_ffmpeg}
 cd ffmpeg
 %configure \
 	--enable-pthreads \
@@ -98,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.3  2005/11/25 19:34:48  qboosh
 - pl
 

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.620 SPECS/openoffice.org.spec:1.621
--- SPECS/openoffice.org.spec:1.620	Thu Nov  2 01:26:12 2006
+++ SPECS/openoffice.org.spec	Mon Nov 13 16:01:54 2006
@@ -2244,7 +2244,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
 rm -rf $RPM_BUILD_ROOT/opt/gnome
 
-%if %{without java}
+%if !%{with java}
 # Java-releated bits
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
@@ -2492,6 +2492,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.621  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.620  2006/11/02 00:26:12  glen
 - STLport epoch
 

================================================================
Index: SPECS/pam.spec
diff -u SPECS/pam.spec:1.243 SPECS/pam.spec:1.244
--- SPECS/pam.spec:1.243	Mon Nov  6 19:06:59 2006
+++ SPECS/pam.spec	Mon Nov 13 16:01:54 2006
@@ -337,7 +337,7 @@
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpamcrypt.a
 
-%if %{without selinux}
+%if !%{with selinux}
 rm -rf $RPM_BUILD_ROOT{/%{_lib}/security/pam_selinux.so,%{_sbindir}/pam_selinux_check,%{_mandir}/man8/pam_selinux*.8*}
 %endif
 
@@ -498,6 +498,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.244  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.243  2006/11/06 18:06:59  glen
 - -modutil_mem_limit.patch from AC-branch; rel 13
 

================================================================
Index: SPECS/pcmciautils.spec
diff -u SPECS/pcmciautils.spec:1.7 SPECS/pcmciautils.spec:1.8
--- SPECS/pcmciautils.spec:1.7	Thu Jun  1 17:58:38 2006
+++ SPECS/pcmciautils.spec	Mon Nov 13 16:01:54 2006
@@ -42,7 +42,7 @@
 %setup -q
 
 %build
-%if %{without startup}
+%if !%{with startup}
 sed -i -e "s#STARTUP =.*#STARTUP = false#g" Makefile
 %endif
 %if %{with udev}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.7  2006/06/01 15:58:38  paszczus
 - updated to 0.14, new lspcmcia tool
 

================================================================
Index: SPECS/perl-Net-DNS.spec
diff -u SPECS/perl-Net-DNS.spec:1.74 SPECS/perl-Net-DNS.spec:1.75
--- SPECS/perl-Net-DNS.spec:1.74	Tue Oct 10 10:40:15 2006
+++ SPECS/perl-Net-DNS.spec	Mon Nov 13 16:01:54 2006
@@ -32,7 +32,7 @@
 BuildRequires:	perl-Test-Pod >= 0.95
 %endif
 BuildRequires:	rpm-perlprov >= 4.1-13
-%if %{without libresolv}
+%if !%{with libresolv}
 BuildArch:	noarch
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -103,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.74  2006/10/10 08:40:15  qboosh
 - Test::Pod version
 

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.607 SPECS/php.spec:1.608
--- SPECS/php.spec:1.607	Sun Nov 12 17:47:12 2006
+++ SPECS/php.spec	Mon Nov 13 16:01:54 2006
@@ -65,7 +65,7 @@
 %undefine	with_interbase
 %endif
 
-%if %{without apache1} && %{without apache2}
+%if !%{with apache1} && !%{with apache2}
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
@@ -1630,7 +1630,7 @@
 %if %{with mssql} || %{with sybase} || %{with sybase_ct}
 	--with-pdo-dblib=shared \
 %endif
-%if %{with interbase} && %{without interbase_inst}
+%if %{with interbase} && !%{with interbase_inst}
 	--with-pdo-firebird=shared \
 %endif
 	--with-pdo-mysql=shared \
@@ -2700,7 +2700,7 @@
 %attr(755,root,root) %{extensionsdir}/pdo_dblib.so
 %endif
 
-%if %{with interbase} && %{without interbase_inst}
+%if %{with interbase} && !%{with interbase_inst}
 %files pdo-firebird
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_firebird.ini
@@ -2894,6 +2894,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.608  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.607  2006/11/12 16:47:12  glen
 - there's no main package
 

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.251 SPECS/poldek.spec:1.252
--- SPECS/poldek.spec:1.251	Mon Oct 30 08:55:29 2006
+++ SPECS/poldek.spec	Mon Nov 13 16:01:54 2006
@@ -314,7 +314,7 @@
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*
 
-%if %{without static}
+%if !%{with static}
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
@@ -344,6 +344,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.251  2006/10/30 07:55:29  cieciwa
 - back ver_db and ver_rpm,
 - release .6

================================================================
Index: SPECS/povray.spec
diff -u SPECS/povray.spec:1.54 SPECS/povray.spec:1.55
--- SPECS/povray.spec:1.54	Thu Nov  9 21:57:28 2006
+++ SPECS/povray.spec	Mon Nov 13 16:01:54 2006
@@ -110,7 +110,7 @@
 %if "%{_lib}" == "lib64"
 ##%patch3 -p1
 %endif
-%if %{without svga}
+%if !%{with svga}
 ##%patch4 -p1
 %endif
 
@@ -224,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.54  2006/11/09 20:57:28  glen
 - strict internal deps
 

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.362 SPECS/qt.spec:1.363
--- SPECS/qt.spec:1.362	Sat Oct 28 23:51:28 2006
+++ SPECS/qt.spec	Mon Nov 13 16:01:54 2006
@@ -874,7 +874,7 @@
 yes
 _EOF_
 
-%if %{without designer}
+%if !%{with designer}
 grep -v designer tools/tools.pro > tools/tools.pro.1
 mv tools/tools.pro{.1,}
 %{__make} -C tools/designer/uic \
@@ -952,7 +952,7 @@
 install tools/qtconfig/images/appicon.png \
 	$RPM_BUILD_ROOT%{_pixmapsdir}/qtconfig.png
 
-%if %{without designer}
+%if !%{with designer}
 install bin/uic $RPM_BUILD_ROOT%{_bindir}
 %endif
 
@@ -1253,6 +1253,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.363  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.362  2006/10/28 21:51:28  qboosh
 - added CVE note to rev. 1.360 changelog message
 

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.110 SPECS/qt4.spec:1.111
--- SPECS/qt4.spec:1.110	Sun Oct 29 10:55:39 2006
+++ SPECS/qt4.spec	Mon Nov 13 16:01:54 2006
@@ -82,7 +82,7 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
-%if %{without AC}
+%if !%{with AC}
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXext-devel
@@ -1567,6 +1567,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.110  2006/10/29 09:55:39  qboosh
 - updated to 4.2.1 (fixes CVE-2006-4811)
 

================================================================
Index: SPECS/quake3.spec
diff -u SPECS/quake3.spec:1.72 SPECS/quake3.spec:1.73
--- SPECS/quake3.spec:1.72	Sat Sep  9 03:34:58 2006
+++ SPECS/quake3.spec	Mon Nov 13 16:01:54 2006
@@ -126,7 +126,7 @@
 BUILD_SERVER	= 1
 BUILD_GAME_SO	= 1
 BUILD_GAME_QVM	= 0
-%if %{without openal}
+%if !%{with openal}
 USE_OPENAL	= 0
 %endif
 EOF
@@ -257,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2006/11/13 15:01:54  sparky
+- don't use %{without ...}, it may not work after inverting bcond
+
 Revision 1.72  2006/09/09 01:34:58  glen
 - rel 2 (rebuild with fixed %useradd/%groupadd macros)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.350&r2=1.351&f=u
    http://cvs.pld-linux.org/SPECS/mythplugins.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/netpbm.spec?r1=1.76&r2=1.77&f=u
    http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/nurbs++.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/nuvtools.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.620&r2=1.621&f=u
    http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.243&r2=1.244&f=u
    http://cvs.pld-linux.org/SPECS/pcmciautils.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/perl-Net-DNS.spec?r1=1.74&r2=1.75&f=u
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.607&r2=1.608&f=u
    http://cvs.pld-linux.org/SPECS/poldek.spec?r1=1.251&r2=1.252&f=u
    http://cvs.pld-linux.org/SPECS/povray.spec?r1=1.54&r2=1.55&f=u
    http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.362&r2=1.363&f=u
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.110&r2=1.111&f=u
    http://cvs.pld-linux.org/SPECS/quake3.spec?r1=1.72&r2=1.73&f=u

More information about the pld-cvs-commit mailing list