# HG changeset patch # User Michael Schloh von Bennewitz # Date 1231942184 -3600 # Node ID e6a1cd7ed6bade1f286ad12aad75f12f9d864961 # Parent 944803a4d3f3215ce1da101995d16bd9c647d80d Correct dependencies due to parallel builds (make) and C++ code (gcc). Additionally, clean up general build and runtime dependencies in packaging. diff -r 944803a4d3f3 -r e6a1cd7ed6ba aqbanking/aqbanking.spec --- a/aqbanking/aqbanking.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/aqbanking/aqbanking.spec Wed Jan 14 15:09:44 2009 +0100 @@ -51,7 +51,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: openssl, gettext, libiconv PreReq: openssl, gettext, libiconv diff -r 944803a4d3f3 -r e6a1cd7ed6ba aqmoney/aqmoney.spec --- a/aqmoney/aqmoney.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/aqmoney/aqmoney.spec Wed Jan 14 15:09:44 2009 +0100 @@ -46,7 +46,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: aqbanking PreReq: aqbanking diff -r 944803a4d3f3 -r e6a1cd7ed6ba arpwatch/arpwatch.spec --- a/arpwatch/arpwatch.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/arpwatch/arpwatch.spec Wed Jan 14 15:09:44 2009 +0100 @@ -47,7 +47,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, libpcap +BuildPreReq: OpenPKG, openpkg >= 20040130, libpcap, make PreReq: OpenPKG, openpkg >= 20040130, libpcap %if "%{with_fsl}" == "yes" BuildPreReq: fsl >= 1.2.0 diff -r 944803a4d3f3 -r e6a1cd7ed6ba as-gui/as-gui.spec --- a/as-gui/as-gui.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/as-gui/as-gui.spec Wed Jan 14 15:09:44 2009 +0100 @@ -44,8 +44,11 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20050615, qt, pkgconfig, make -PreReq: OpenPKG, openpkg >= 20050615, qt +BuildPreReq: OpenPKG, openpkg >= 20050615 +PreReq: OpenPKG, openpkg >= 20050615 +BuildPreReq: make, gcc, gcc::with_cxx = yes, pkgconfig +BuildPreReq: qt +PreReq: qt %if "%{with_corba}" == "yes" BuildPreReq: mico PreReq: mico diff -r 944803a4d3f3 -r e6a1cd7ed6ba cryptbreaker/cryptbreaker.spec --- a/cryptbreaker/cryptbreaker.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/cryptbreaker/cryptbreaker.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, make PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba cryptlib/cryptlib.spec --- a/cryptlib/cryptlib.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/cryptlib/cryptlib.spec Wed Jan 14 15:09:44 2009 +0100 @@ -48,7 +48,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, infozip, make, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, infozip PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba dbus/dbus.spec --- a/dbus/dbus.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/dbus/dbus.spec Wed Jan 14 15:09:44 2009 +0100 @@ -42,7 +42,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, pkgconfig PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: libxml PreReq: libxml diff -r 944803a4d3f3 -r e6a1cd7ed6ba dpkg/dpkg.spec --- a/dpkg/dpkg.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/dpkg/dpkg.spec Wed Jan 14 15:09:44 2009 +0100 @@ -45,7 +45,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: gettext, libiconv, bzip2, zlib PreReq: gettext, libiconv, bzip2, zlib diff -r 944803a4d3f3 -r e6a1cd7ed6ba easysoap/easysoap.spec --- a/easysoap/easysoap.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/easysoap/easysoap.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,8 +41,11 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, expat, openssl, gcc, make -PreReq: OpenPKG, openpkg >= 20040130, expat, openssl +BuildPreReq: OpenPKG, openpkg >= 20040130 +PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: make, gcc, gcc::with_cxx = yes +BuildPreReq: expat, openssl +PreReq: expat, openssl AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba gmediaserver/gmediaserver.spec --- a/gmediaserver/gmediaserver.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/gmediaserver/gmediaserver.spec Wed Jan 14 15:09:44 2009 +0100 @@ -47,8 +47,8 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc -PreReq: OpenPKG, openpkg >= 20040130, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc +PreReq: OpenPKG, openpkg >= 20040130 BuildPreReq: libupnp, file, id3lib, taglib PreReq: libupnp, file, id3lib, taglib %if "%{with_fsl}" == "yes" diff -r 944803a4d3f3 -r e6a1cd7ed6ba id3lib/id3lib.spec --- a/id3lib/id3lib.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/id3lib/id3lib.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba jhead/jhead.spec --- a/jhead/jhead.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/jhead/jhead.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, make PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba libgdiplus/libgdiplus.spec --- a/libgdiplus/libgdiplus.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/libgdiplus/libgdiplus.spec Wed Jan 14 15:09:44 2009 +0100 @@ -42,10 +42,12 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, zlib, glib2, X11, xrender -BuildPreReq: cairo, fontconfig, freetype, giflib, jpeg, png, tiff -PreReq: OpenPKG, openpkg >= 20040130, zlib, glib2, X11, xrender -PreReq: cairo, fontconfig, freetype, giflib, jpeg, png, tiff +BuildPreReq: OpenPKG, openpkg >= 20040130, make +PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: zlib, glib2, X11, xrender, cairo +PreReq: zlib, glib2, X11, xrender, cairo +BuildPreReq: fontconfig, freetype, giflib, jpeg, png, tiff +PreReq: fontconfig, freetype, giflib, jpeg, png, tiff AutoReq: no AutoReqProv: no Conflicts: pnet diff -r 944803a4d3f3 -r e6a1cd7ed6ba libpcap/libpcap.spec --- a/libpcap/libpcap.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/libpcap/libpcap.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, bison, flex +BuildPreReq: OpenPKG, openpkg >= 20040130, make, bison, flex PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba libupnp/libupnp.spec --- a/libupnp/libupnp.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/libupnp/libupnp.spec Wed Jan 14 15:09:44 2009 +0100 @@ -42,7 +42,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, make PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba lsof/lsof.spec --- a/lsof/lsof.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/lsof/lsof.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba m2tstoavi/m2tstoavi.spec --- a/m2tstoavi/m2tstoavi.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/m2tstoavi/m2tstoavi.spec Wed Jan 14 15:09:44 2009 +0100 @@ -42,7 +42,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, infozip +BuildPreReq: OpenPKG, openpkg >= 20040130, make, infozip PreReq: OpenPKG, openpkg >= 20040130, ffmpeg, tcsh AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba mesa/mesa.spec --- a/mesa/mesa.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/mesa/mesa.spec Wed Jan 14 15:09:44 2009 +0100 @@ -48,7 +48,8 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130 PreReq: OpenPKG, openpkg >= 20040130 -BuildPreReq: X11, gcc, make, autoconf, binutils +BuildPreReq: make, gcc, gcc::with_cxx = yes, autoconf, binutils +BuildPreReq: X11 PreReq: X11 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba mico/mico.spec --- a/mico/mico.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/mico/mico.spec Wed Jan 14 15:09:44 2009 +0100 @@ -48,7 +48,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, make +BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20060823 %if "%{with_ssl}" == "yes" BuildPreReq: openssl diff -r 944803a4d3f3 -r e6a1cd7ed6ba mpg123/mpg123.spec --- a/mpg123/mpg123.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/mpg123/mpg123.spec Wed Jan 14 15:09:44 2009 +0100 @@ -44,7 +44,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20040130, make PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba radiusclient/radiusclient.spec --- a/radiusclient/radiusclient.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/radiusclient/radiusclient.spec Wed Jan 14 15:09:44 2009 +0100 @@ -48,7 +48,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20060823, make PreReq: OpenPKG, openpkg >= 20060823 %if "%{with_fsl}" == "yes" BuildPreReq: fsl diff -r 944803a4d3f3 -r e6a1cd7ed6ba sox/sox.spec --- a/sox/sox.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/sox/sox.spec Wed Jan 14 15:09:44 2009 +0100 @@ -40,7 +40,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba stlport/stlport.spec --- a/stlport/stlport.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/stlport/stlport.spec Wed Jan 14 15:09:44 2009 +0100 @@ -44,7 +44,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make PreReq: OpenPKG, openpkg >= 20040130, gcc AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba stun/stun.spec --- a/stun/stun.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/stun/stun.spec Wed Jan 14 15:09:44 2009 +0100 @@ -46,7 +46,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc +BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20060823 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba taglib/taglib.spec --- a/taglib/taglib.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/taglib/taglib.spec Wed Jan 14 15:09:44 2009 +0100 @@ -41,7 +41,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc +BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20040130 AutoReq: no AutoReqProv: no diff -r 944803a4d3f3 -r e6a1cd7ed6ba tun/tun.spec --- a/tun/tun.spec Wed Jan 14 14:47:21 2009 +0100 +++ b/tun/tun.spec Wed Jan 14 15:09:44 2009 +0100 @@ -45,7 +45,7 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20050726 +BuildPreReq: OpenPKG, openpkg >= 20050726, make PreReq: OpenPKG, openpkg >= 20050726 AutoReq: no AutoReqProv: no