[svn] r5090 - in trunk/rpms: ffmpeg memtest86+ vlc wxGTK

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Jan 17 13:10:18 CET 2007


Author: dag
Date: 2007-01-17 13:10:16 +0100 (Wed, 17 Jan 2007)
New Revision: 5090

Modified:
   trunk/rpms/ffmpeg/ffmpeg.spec
   trunk/rpms/memtest86+/memtest86+.spec
   trunk/rpms/vlc/vlc.spec
   trunk/rpms/wxGTK/wxGTK-2.6.spec
   trunk/rpms/wxGTK/wxGTK.spec
Log:
Updates

Modified: trunk/rpms/ffmpeg/ffmpeg.spec
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg.spec	2007-01-16 17:37:59 UTC (rev 5089)
+++ trunk/rpms/ffmpeg/ffmpeg.spec	2007-01-17 12:10:16 UTC (rev 5090)
@@ -38,8 +38,6 @@
 Patch1: ffmpeg-20070109-faad2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel
-### configure needs sed -i option
-BuildRequires: sed >= 4.0.7
 %{!?_without_texi2html:BuildRequires: texi2html}
 %{!?_without_lame:BuildRequires: lame-devel}
 %{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel}

Modified: trunk/rpms/memtest86+/memtest86+.spec
===================================================================
--- trunk/rpms/memtest86+/memtest86+.spec	2007-01-16 17:37:59 UTC (rev 5089)
+++ trunk/rpms/memtest86+/memtest86+.spec	2007-01-17 12:10:16 UTC (rev 5090)
@@ -4,15 +4,12 @@
 
 # Screenshot: http://www.memtest.org/pics/i875-big.gif
 
-# ExcludeDist: el4
-##ExcludeDist: fc2
-
 %define _prefix /boot
 
 Summary: Thorough, stand-alone memory tester
 Name: memtest86+
-Version: 1.65
-Release: 1.2
+Version: 1.70
+Release: 1
 License: GPL
 Group: System Environment/Kernel
 URL: http://www.memtest.org/
@@ -60,8 +57,8 @@
 %{_prefix}/%{name}-%{version}
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.65-1.2
-- Rebuild for Fedora Core 5.
+* Wed Jan 17 2007 Dag Wieers <dag at wieers.com> - 1.70-1
+- Updated to release 1.70.
 
 * Wed Nov 30 2005 Dag Wieers <dag at wieers.com> - 1.65-1
 - Updated to release 1.65.

Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec	2007-01-16 17:37:59 UTC (rev 5089)
+++ trunk/rpms/vlc/vlc.spec	2007-01-17 12:10:16 UTC (rev 5090)
@@ -19,24 +19,25 @@
 %{?el4:%define _without_jack 1}
 %{?el4:%define _without_sysfs 1}
 %{?el4:%define _without_upnp 1}
-%{?el4:%define _without_wxwidgets 1}
 
 %{?fc3:%define _without_jack 1}
 %{?fc3:%define _without_sysfs 1}
 %{?fc3:%define _without_upnp 1}
-%{?fc3:%define _without_wxwidgets 1}
+#{?fc3:#define _without_wxwidgets 1}
 
+%{?fc2:%define _without_hal 1}
 %{?fc2:%define _without_jack 1}
 %{?fc2:%define _without_sysfs 1}
 %{?fc2:%define _without_upnp 1}
-%{?fc2:%define _without_wxwidgets 1}
+#{?fc2:#define _without_wxwidgets 1}
 
 %{?fc1:%define _without_alsa 1}
+%{?fc1:%define _without_hal 1}
 %{?fc1:%define _without_jack 1}
 %{?fc1:%define _without_sysfs 1}
 %{?fc1:%define _without_theora 1}
 %{?fc1:%define _without_upnp 1}
-%{?fc1:%define _without_wxwidgets 1}
+#{?fc1:#define _without_wxwidgets 1}
 
 %{?el3:%define _without_alsa 1}
 %{?el3:%define _without_fribidi 1}
@@ -45,7 +46,7 @@
 %{?el3:%define _without_sysfs 1}
 %{?el3:%define _without_theora 1}
 %{?el3:%define _without_upnp 1}
-%{?el3:%define _without_wxwidgets 1}
+#{?el3:#define _without_wxwidgets 1}
 
 %{?rh9:%define _without_alsa 1}
 %{?rh9:%define _without_fribidi 1}
@@ -54,7 +55,7 @@
 %{?rh9:%define _without_sysfs 1}
 %{?rh9:%define _without_theora 1}
 %{?rh9:%define _without_upnp 1}
-%{?rh9:%define _without_wxwidgets 1}
+#{?rh9:#define _without_wxwidgets 1}
 %{?rh9:%define _without_x264 1}
 
 %{?rh7:%define _without_alsa 1}
@@ -66,7 +67,7 @@
 %{?rh7:%define _without_theora 1}
 %{?rh7:%define _without_upnp 1}
 %{?rh7:%define _without_vorbis 1}
-%{?rh7:%define _without_wxwidgets 1}
+#{?rh7:#define _without_wxwidgets 1}
 %{?rh7:%define _without_x264 1}
 %{?rh7:%define _without_xosd 1}
 
@@ -81,7 +82,7 @@
 %{?el2:%define _without_theora 1}
 %{?el2:%define _without_upnp 1}
 %{?el2:%define _without_vorbis 1}
-%{?el2:%define _without_wxwidgets 1}
+#{?el2:#define _without_wxwidgets 1}
 %{?el2:%define _without_x264 1}
 %{?el2:%define _without_xosd 1}
 
@@ -95,7 +96,7 @@
 Summary: The VideoLAN client, also a very good standalone video player
 Name: vlc
 Version: 0.8.6a
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.videolan.org/
@@ -269,7 +270,7 @@
     %{?_with_portaudio:--enable-portaudio} \
     %{!?_without_arts:--enable-arts} \
     %{!?_without_alsa:--enable-alsa} \
-    %{?_without_wxwidgets:--disable-wxwidgets} \
+    %{?_without_wxwidgets:--disable-wxwidgets --disable-skins2} \
     %{!?_without_xosd:--enable-xosd} \
     %{!?_without_lirc:--enable-lirc} \
     %{?_with_mozilla:--enable-mozilla} \
@@ -324,6 +325,9 @@
 
 
 %changelog
+* Tue Jan 16 2007 Dag Wieers <dag at wieers.com> - 0.8.6a-2
+- Build against wxGTK 2.6.3.
+
 * Mon Jan  8 2007 Matthias Saou <http://freshrpms.net/> 0.8.6a-1
 - Update to 0.8.6a.
 - Add faad2 patch.

Modified: trunk/rpms/wxGTK/wxGTK-2.6.spec
===================================================================
--- trunk/rpms/wxGTK/wxGTK-2.6.spec	2007-01-16 17:37:59 UTC (rev 5089)
+++ trunk/rpms/wxGTK/wxGTK-2.6.spec	2007-01-17 12:10:16 UTC (rev 5090)
@@ -85,7 +85,7 @@
 %{__cat} wxstd.lang wxmsw.lang >>wx.lang
 
 ### Overwrite wrong symlink (includes buildroot)
-%{__ln_s} -f ../lib/wx/config/gtk2-unicode-release-2.6 %{buildroot}%{_bindir}/wx-config
+%{__ln_s} -f ../%{_lib}/wx/config/gtk2-unicode-release-2.6 %{buildroot}%{_bindir}/wx-config
 
 %clean
 %{__rm} -rf %{buildroot}

Modified: trunk/rpms/wxGTK/wxGTK.spec
===================================================================
--- trunk/rpms/wxGTK/wxGTK.spec	2007-01-16 17:37:59 UTC (rev 5089)
+++ trunk/rpms/wxGTK/wxGTK.spec	2007-01-17 12:10:16 UTC (rev 5090)
@@ -48,7 +48,6 @@
 
 %prep
 %setup
-#%{__perl} -pi.orig -e 's| /usr/lib| %{_libdir} %{_prefix}/X11R6/%{_lib}|g' configure
 
 %build
 %configure \
@@ -85,7 +84,7 @@
 %{__cat} wxstd.lang wxmsw.lang >>wx.lang
 
 ### Overwrite wrong symlink (includes buildroot)
-%{__ln_s} -f ../../lib/wx/config/gtk2-ansi-release-2.6 %{buildroot}%{_bindir}/wx-config
+%{__ln_s} -f ../%{_lib}/wx/config/gtk2-ansi-release-2.6 %{buildroot}%{_bindir}/wx-config
 
 %clean
 %{__rm} -rf %{buildroot}



More information about the svn-commits mailing list