[svn] r4725 - in trunk/rpms: BasiliskII bmp-mp3 bmpx cinelerra glame gnuboy gxmame kino libquicktime mixxx mjpegtools mpeg2dec mplayer ogle quake3 snes9x swfdec xine xmame zvbi

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Sep 18 16:08:00 CEST 2006 

Author: thias
Date: 2006-09-18 16:07:57 +0200 (Mon, 18 Sep 2006)
New Revision: 4725

Modified:
   trunk/rpms/BasiliskII/BasiliskII.spec
   trunk/rpms/bmp-mp3/bmp-mp3.spec
   trunk/rpms/bmpx/bmpx.spec
   trunk/rpms/cinelerra/cinelerra.spec
   trunk/rpms/glame/glame.spec
   trunk/rpms/gnuboy/gnuboy.spec
   trunk/rpms/gxmame/gxmame.spec
   trunk/rpms/kino/kino.spec
   trunk/rpms/libquicktime/libquicktime.spec
   trunk/rpms/mixxx/mixxx.spec
   trunk/rpms/mjpegtools/mjpegtools.spec
   trunk/rpms/mpeg2dec/mpeg2dec.spec
   trunk/rpms/mplayer/mplayer.spec
   trunk/rpms/ogle/ogle.spec
   trunk/rpms/quake3/quake3.spec
   trunk/rpms/snes9x/snes9x.spec
   trunk/rpms/swfdec/swfdec.spec
   trunk/rpms/xine/xine.spec
   trunk/rpms/xmame/xmame.spec
   trunk/rpms/zvbi/zvbi.spec
Log:
Minor changes for FC6 rebuilds (mostly adding ?fc6 conditions).


Modified: trunk/rpms/BasiliskII/BasiliskII.spec
===================================================================
--- trunk/rpms/BasiliskII/BasiliskII.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/BasiliskII/BasiliskII.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -10,12 +10,14 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_banks 1}
+%{?fc6:  %define _with_banks 1}
 %{?fc5:  %define _with_banks 1}
 %{?fc4:  %define _with_banks 1}
 %{?el4:  %define _with_banks 1}
 %{?fc3:  %define _with_banks 1}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 Summary: 68k Macintosh emulator

Modified: trunk/rpms/bmp-mp3/bmp-mp3.spec
===================================================================
--- trunk/rpms/bmp-mp3/bmp-mp3.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/bmp-mp3/bmp-mp3.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 Summary: MP3 playback plugin for the Beep Media Player

Modified: trunk/rpms/bmpx/bmpx.spec
===================================================================
--- trunk/rpms/bmpx/bmpx.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/bmpx/bmpx.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -50,7 +50,8 @@
     --enable-hal \
     --enable-mp4v2 \
     --enable-sid
-%{__make} %{?_smp_mflags}
+# Remove %{?_smp_mflags} as the build takes up 2GB RAM with -j4 (Dual HT)
+%{__make}
 
 
 %install

Modified: trunk/rpms/cinelerra/cinelerra.spec
===================================================================
--- trunk/rpms/cinelerra/cinelerra.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/cinelerra/cinelerra.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
 %define prever 20060512

Modified: trunk/rpms/glame/glame.spec
===================================================================
--- trunk/rpms/glame/glame.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/glame/glame.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
 %define desktop_vendor rpmforge
@@ -21,7 +22,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): info
 Requires(preun): info
-BuildRequires: gcc-c++, libgnomeui-devel, libglade-devel, guile-devel
+BuildRequires: gcc-c++, libgnomeui-devel, guile-devel
 BuildRequires: libgnomecanvas-devel, gtk2-devel >= 2.6.0
 BuildRequires: fftw-devel, audiofile-devel, esound-devel
 BuildRequires: lame-devel, libmad-devel, libvorbis-devel, ladspa-devel
@@ -58,7 +59,8 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make}
+# %{?_smp_mflags}
 
 
 %install
@@ -129,6 +131,9 @@
 
 
 %changelog
+* Thu Jun 15 2006 Matthias Saou <http://freshrpms.net/> 2.0.1-3
+- Remove old leftover libglade-devel build requirement.
+
 * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 2.0.1-3
 - Release bump to drop the disttag number in FC5 build.
 

Modified: trunk/rpms/gnuboy/gnuboy.spec
===================================================================
--- trunk/rpms/gnuboy/gnuboy.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/gnuboy/gnuboy.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
 Summary: Nintendo GameBoy Color emulator

Modified: trunk/rpms/gxmame/gxmame.spec
===================================================================
--- trunk/rpms/gxmame/gxmame.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/gxmame/gxmame.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_gettextdevel 1}
+%{?fc6:  %define _with_gettextdevel 1}
 %{?fc5:  %define _with_gettextdevel 1}
 %{?fc4:  %define _with_gettextdevel 1}
 %{?fc3:  %define _with_gettextdevel 1}

Modified: trunk/rpms/kino/kino.spec
===================================================================
--- trunk/rpms/kino/kino.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/kino/kino.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -6,6 +6,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 #define cvs 20060320

Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/libquicktime/libquicktime.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -6,6 +6,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
 %{?fc1:%define _without_alsa 1}

Modified: trunk/rpms/mixxx/mixxx.spec
===================================================================
--- trunk/rpms/mixxx/mixxx.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/mixxx/mixxx.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %{?fc1:%define _without_alsa 1}

Modified: trunk/rpms/mjpegtools/mjpegtools.spec
===================================================================
--- trunk/rpms/mjpegtools/mjpegtools.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/mjpegtools/mjpegtools.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -9,9 +9,11 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 #{!?dist:%define _without_mmx 1}
+#{?fc6:  %define _without_mmx 1}
 #{?fc5:  %define _without_mmx 1}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %{?fc1:%define _without_alsa 1}

Modified: trunk/rpms/mpeg2dec/mpeg2dec.spec
===================================================================
--- trunk/rpms/mpeg2dec/mpeg2dec.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/mpeg2dec/mpeg2dec.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -6,6 +6,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
 #define date 20040610

Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/mplayer/mplayer.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -57,7 +57,7 @@
 Summary: MPlayer, the Movie Player for Linux
 Name: mplayer
 Version: 1.0
-Release: 0.29%{?rcver:.%{rcver}}%{?date:.%{date}}
+Release: 0.30%{?rcver:.%{rcver}}%{?date:.%{date}}
 License: GPL
 Group: Applications/Multimedia
 URL: http://mplayerhq.hu/
@@ -87,7 +87,7 @@
 BuildRequires: gtk2-devel, SDL-devel
 BuildRequires: libpng-devel, libjpeg-devel, libungif-devel
 BuildRequires: lame-devel, libmad-devel, flac-devel
-BuildRequires: libmatroska-devel, gcc-c++
+BuildRequires: libmatroska-devel
 BuildRequires: ImageMagick
 %{?_with_dvdread:BuildRequires: libdvdread-devel}
 %{!?_without_dvb:BuildRequires: kernel = %{kversion}, kernel-devel = %{kversion}}
@@ -113,7 +113,8 @@
 %{!?_without_amrnb:BuildRequires: amrnb-devel}
 %{!?_without_samba:BuildRequires: samba-common}
 %{!?_without_speex:BuildRequires: speex-devel}
-%{?_with_modxorg:BuildRequires: libXv-devel, libXxf86vm-devel, libGL-devel}
+%{!?_without_nas:BuildRequires: nas-devel}
+%{?_with_modxorg:BuildRequires: libXv-devel, libXxf86vm-devel, libGL-devel, libXt-devel}
 %{!?_with_modxorg:%{!?_without_xvmc:BuildRequires: libXvMCW-devel}}
 %{?_with_modxorg:%{!?_without_xvmc:BuildRequires: libXvMC-devel}}
 
@@ -309,6 +310,10 @@
 
 
 %changelog
+* Mon Sep  4 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.30.pre8
+- Add nas support by default.
+- Add libXt-devel build requirement if modxorg since the nas check requires it.
+
 * Mon Jul 31 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.29.pre8
 - Update Blue skin to 1.6.
 - Update live library to 2006.07.04.

Modified: trunk/rpms/ogle/ogle.spec
===================================================================
--- trunk/rpms/ogle/ogle.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/ogle/ogle.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -8,6 +8,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %{?fc1:%define _without_alsa 1}

Modified: trunk/rpms/quake3/quake3.spec
===================================================================
--- trunk/rpms/quake3/quake3.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/quake3/quake3.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %define svn 792

Modified: trunk/rpms/snes9x/snes9x.spec
===================================================================
--- trunk/rpms/snes9x/snes9x.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/snes9x/snes9x.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 #define prever -WIP1

Modified: trunk/rpms/swfdec/swfdec.spec
===================================================================
--- trunk/rpms/swfdec/swfdec.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/swfdec/swfdec.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,10 +5,13 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist: %define _without_gstreamer 1}
+%{?fc6:   %define _without_gstreamer 1}
 %{?fc5:   %define _without_gstreamer 1}
 %{!?dist: %define _with_modxorg 1}
+%{?fc6:   %define _with_modxorg 1}
 %{?fc5:   %define _with_modxorg 1}
 %{!?dist: %define gimp_plugin 1}
+%{?fc6:   %define gimp_plugin 1}
 %{?fc5:   %define gimp_plugin 1}
 %{?el4:   %define gimp_plugin 1}
 %{?fc4:   %define gimp_plugin 1}
@@ -16,6 +19,7 @@
 %{?fc2:   %define gimp_plugin 1}
 %{?yd4:   %define gimp_plugin 1}
 %{!?dist: %define _without_mozilla 1}
+%{?fc6:   %define _without_mozilla 1}
 %{?fc5:   %define _without_mozilla 1}
 %{?fc1:   %define _without_mozilla 1}
 %{?el3:   %define _without_mozilla 1}

Modified: trunk/rpms/xine/xine.spec
===================================================================
--- trunk/rpms/xine/xine.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/xine/xine.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %{?rh7:%define _without_freedesktop 1}

Modified: trunk/rpms/xmame/xmame.spec
===================================================================
--- trunk/rpms/xmame/xmame.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/xmame/xmame.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 %{?el4:%define _without_glide3 1}

Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec	2006-09-18 11:47:30 UTC (rev 4724)
+++ trunk/rpms/zvbi/zvbi.spec	2006-09-18 14:07:57 UTC (rev 4725)
@@ -5,6 +5,7 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
 Summary: Raw VBI, Teletext and Closed Caption decoding library

More information about the svn-commits mailing list