packages: batik/batik.spec, dLAN/dLAN.spec, ghc/ghc.spec, java-httpunit/jav...

sparky sparky at pld-linux.org
Fri Jan 15 21:29:17 CET 2010


Author: sparky                       Date: Fri Jan 15 20:29:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't use %{?without_...} - it may not work after inverting bcond

---- Files affected:
packages/batik:
   batik.spec (1.27 -> 1.28) 
packages/dLAN:
   dLAN.spec (1.15 -> 1.16) 
packages/ghc:
   ghc.spec (1.98 -> 1.99) 
packages/java-httpunit:
   java-httpunit.spec (1.14 -> 1.15) 
packages/mythtv:
   mythtv.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/batik/batik.spec
diff -u packages/batik/batik.spec:1.27 packages/batik/batik.spec:1.28
--- packages/batik/batik.spec:1.27	Tue Dec 30 22:21:09 2008
+++ packages/batik/batik.spec	Fri Jan 15 21:29:11 2010
@@ -18,7 +18,7 @@
 Patch0:		%{name}-nodocs.patch
 URL:		http://xml.apache.org/batik/
 %{?with_docs:BuildRequires:	apache-forrest}
-%{?without_bootstrap:BuildRequires:	fop}
+%{!?with_bootstrap:BuildRequires:	fop}
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
 BuildRequires:	rhino
@@ -117,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/01/15 20:29:11  sparky
+- don't use %{?without_...} - it may not work after inverting bcond
+
 Revision 1.27  2008/12/30 21:21:09  pawelz
 - added bootstrap bcond that allows to break BR-loop
 - don't use jar files provided with sources when building without bootstrap

================================================================
Index: packages/dLAN/dLAN.spec
diff -u packages/dLAN/dLAN.spec:1.15 packages/dLAN/dLAN.spec:1.16
--- packages/dLAN/dLAN.spec:1.15	Wed Jan  9 21:05:46 2008
+++ packages/dLAN/dLAN.spec	Fri Jan 15 21:29:12 2010
@@ -69,7 +69,7 @@
 
 %build
 %configure \
-	%{?without_kernel:--disable-usbdriver}
+	%{!?with_kernel:--disable-usbdriver}
 
 %if %{with userspace}
 %{__make} -C tool
@@ -127,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/01/15 20:29:12  sparky
+- don't use %{?without_...} - it may not work after inverting bcond
+
 Revision 1.15  2008/01/09 20:05:46  qboosh
 - informative descs
 

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.98 packages/ghc/ghc.spec:1.99
--- packages/ghc/ghc.spec:1.98	Thu Nov 26 00:24:11 2009
+++ packages/ghc/ghc.spec	Fri Jan 15 21:29:12 2010
@@ -141,7 +141,7 @@
 #SplitObjs	   = YES
 #SplitObjs	   = No
 #GhcBootLibs	 = %{!?with_extralibs:NO}%{?with_extralibs:YES}
-#%{?without_doc:HADDOCK_DOCS = NO}
+#%{!?with_doc:HADDOCK_DOCS = NO}
 EOF
 
 %if %{with unregistered}
@@ -862,6 +862,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2010/01/15 20:29:12  sparky
+- don't use %{?without_...} - it may not work after inverting bcond
+
 Revision 1.98  2009/11/25 23:24:11  baggins
 - rel 3
 

================================================================
Index: packages/java-httpunit/java-httpunit.spec
diff -u packages/java-httpunit/java-httpunit.spec:1.14 packages/java-httpunit/java-httpunit.spec:1.15
--- packages/java-httpunit/java-httpunit.spec:1.14	Fri Apr  3 17:48:55 2009
+++ packages/java-httpunit/java-httpunit.spec	Fri Jan 15 21:29:12 2010
@@ -40,14 +40,14 @@
 BuildRequires:	javamail >= 0:1.2
 %{?with_jtidy:BuildRequires:	jtidy >= 1.0-0.20000804r7dev}
 BuildRequires:	junit >= 3.8
-%{?without_jtidy:BuildRequires:	nekohtml >= 0.9.1}
+%{!?with_jtidy:BuildRequires:	nekohtml >= 0.9.1}
 BuildRequires:	rhino >= 1.5R4.1
 # BuildRequires:	servlet >= 2.3
 BuildRequires:	unzip
 Requires:	java-junit >= 0:3.8
 Requires:	java-xerces >= 2.5
 %{?with_jtidy:Requires:	jtidy >= 1.0-0.20000804r7dev}
-%{?without_jtidy:Requires:	nekohtml >= 0.9.1}
+%{!?with_jtidy:Requires:	nekohtml >= 0.9.1}
 Requires:	rhino >= 1.5R4.1
 # Requires:	servlet >= 2.3
 BuildArch:	noarch
@@ -121,7 +121,7 @@
 #ln -s $(find-jar servlet) jars/servlet.jar
 ln -s $(find-jar xerces) jars/xerces.jar
 %{?with_jtidy:ln -s $(find-jar jtidy) jars/Tidy.jar}
-%{?without_jtidy:ln -s $(find-jar nekohtml) jars/nekohtml.jar}
+%{!?with_jtidy:ln -s $(find-jar nekohtml) jars/nekohtml.jar}
 ln -s $(find-jar js) jars/js.jar
 
 %ant \
@@ -196,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/01/15 20:29:12  sparky
+- don't use %{?without_...} - it may not work after inverting bcond
+
 Revision 1.14  2009/04/03 15:48:55  pawelz
 - jdk bconds
 - java- prefix for name

================================================================
Index: packages/mythtv/mythtv.spec
diff -u packages/mythtv/mythtv.spec:1.93 packages/mythtv/mythtv.spec:1.94
--- packages/mythtv/mythtv.spec:1.93	Sat Jan  9 23:15:52 2010
+++ packages/mythtv/mythtv.spec	Fri Jan 15 21:29:12 2010
@@ -109,7 +109,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 %{?with_pulseaudio:BuildRequires: pulseaudio-devel}
-%{?without_pulseaudio:BuildConflicts: pulseaudio-devel}
+%{!?with_pulseaudio:BuildConflicts: pulseaudio-devel}
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRequires:	rpm-pythonprov
@@ -625,6 +625,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/01/15 20:29:12  sparky
+- don't use %{?without_...} - it may not work after inverting bcond
+
 Revision 1.93  2010/01/09 22:15:52  w.kier
 - Source0 changed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/batik/batik.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dLAN/dLAN.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.98&r2=1.99&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-httpunit/java-httpunit.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythtv/mythtv.spec?r1=1.93&r2=1.94&f=u



More information about the pld-cvs-commit mailing list