SPECS: ash.spec, emotion.spec, jasper.spec, kchmviewer.spec, kdemu...

sparky sparky at pld-linux.org
Mon Nov 13 16:38:11 CET 2006


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

---- Files affected:
SPECS:
   ash.spec (1.71 -> 1.72) , emotion.spec (1.13 -> 1.14) , jasper.spec (1.33 -> 1.34) , kchmviewer.spec (1.14 -> 1.15) , kdemultimedia.spec (1.224 -> 1.225) , oww.spec (1.6 -> 1.7) , tora.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/ash.spec
diff -u SPECS/ash.spec:1.71 SPECS/ash.spec:1.72
--- SPECS/ash.spec:1.71	Thu Feb 17 00:24:38 2005
+++ SPECS/ash.spec	Mon Nov 13 16:38:04 2006
@@ -54,7 +54,7 @@
 %{?with_dietlibc:BuildRequires:	dietlibc-devel}
 BuildRequires:	flex
 %if %{with static}
-%{?without_uClibc:BuildRequires: glibc-static}
+%{!?with_uClibc:BuildRequires: glibc-static}
 %{?with_uClibc:BuildRequires: uClibc-static > 2:0.9.27-1}
 %endif
 %{?with_uClibc:BuildRequires: uClibc-devel > 2:0.9.27-1}
@@ -275,6 +275,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.71  2005/02/16 23:24:38  tommat
 - fixed with dietlibc bcond comment
 

================================================================
Index: SPECS/emotion.spec
diff -u SPECS/emotion.spec:1.13 SPECS/emotion.spec:1.14
--- SPECS/emotion.spec:1.13	Mon Nov 13 15:54:48 2006
+++ SPECS/emotion.spec	Mon Nov 13 16:38:04 2006
@@ -101,8 +101,8 @@
 %{__automake}
 %configure \
 	%{!?with_static_libs:--disable-static} \
-	%{?without_gstreamer:--disable-gstreamer} \
-	%{?without_xine:--disable-xine}
+	%{!?with_gstreamer:--disable-gstreamer} \
+	%{!?with_xine:--disable-xine}
 %{__make}
 
 %install
@@ -159,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.13  2006/11/13 14:54:48  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 

================================================================
Index: SPECS/jasper.spec
diff -u SPECS/jasper.spec:1.33 SPECS/jasper.spec:1.34
--- SPECS/jasper.spec:1.33	Thu Nov  9 10:12:18 2006
+++ SPECS/jasper.spec	Mon Nov 13 16:38:04 2006
@@ -108,7 +108,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-        %{?without_opengl:--disable-opengl} \
+        %{!?with_opengl:--disable-opengl} \
 	--enable-shared
 
 %{__make}
@@ -157,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.33  2006/11/09 09:12:18  jajcus
 - non-conditional glut-devel BR removed
 

================================================================
Index: SPECS/kchmviewer.spec
diff -u SPECS/kchmviewer.spec:1.14 SPECS/kchmviewer.spec:1.15
--- SPECS/kchmviewer.spec:1.14	Mon Aug 21 18:11:59 2006
+++ SPECS/kchmviewer.spec	Mon Nov 13 16:38:04 2006
@@ -60,7 +60,7 @@
 %endif
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{?with_kde:--with-kde} \
-	%{?without_arts:--without-arts} \
+	%{!?with_arts:--without-arts} \
 	--with-qt-libraries=%{_libdir}
 %{__make}
 
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.14  2006/08/21 16:11:59  maciek2w
 - updated to 2.6
 

================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.224 SPECS/kdemultimedia.spec:1.225
--- SPECS/kdemultimedia.spec:1.224	Mon Nov 13 15:56:53 2006
+++ SPECS/kdemultimedia.spec	Mon Nov 13 16:38:04 2006
@@ -575,7 +575,7 @@
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--with%{?without_alsa:out}-arts-alsa \
+	--with%{!?with_alsa:out}-arts-alsa \
 	--with-extra-includes=%{_includedir}/speex \
 	--with-qt-libraries=%{_libdir} \
 	--with-distribution="PLD Linux Distribution" \
@@ -963,6 +963,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.224  2006/11/13 14:56:53  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 

================================================================
Index: SPECS/oww.spec
diff -u SPECS/oww.spec:1.6 SPECS/oww.spec:1.7
--- SPECS/oww.spec:1.6	Wed Apr 26 23:16:11 2006
+++ SPECS/oww.spec	Mon Nov 13 16:38:04 2006
@@ -51,8 +51,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	%{?without_libghttp:--without-libghttp} \
-	%{?without_libusb:--without-usb}
+	%{!?with_libghttp:--without-libghttp} \
+	%{!?with_libusb:--without-usb}
 
 %{__make}
 
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.6  2006/04/26 21:16:11  hunter
 - fixed previous commit msg
 

================================================================
Index: SPECS/tora.spec
diff -u SPECS/tora.spec:1.36 SPECS/tora.spec:1.37
--- SPECS/tora.spec:1.36	Tue Nov  7 23:31:36 2006
+++ SPECS/tora.spec	Mon Nov 13 16:38:04 2006
@@ -45,7 +45,7 @@
 %configure \
 	--libdir=%{_libdir}/%{name} \
 	--enable-plugin \
-	%{?with_oracle:--with-oracle}%{?without_oracle:--without-oracle}
+	%{?with_oracle:--with-oracle}%{!?with_oracle:--without-oracle}
 
 %{__make}
 
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/11/13 15:38:04  sparky
+- don't use %{?without_...:...}, it may not work after inverting bcond
+
 Revision 1.36  2006/11/07 22:31:36  glen
 - do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ash.spec?r1=1.71&r2=1.72&f=u
    http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/jasper.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/kdemultimedia.spec?r1=1.224&r2=1.225&f=u
    http://cvs.pld-linux.org/SPECS/oww.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/tora.spec?r1=1.36&r2=1.37&f=u



More information about the pld-cvs-commit mailing list