[svn] r5461 - in trunk/rpms: BasiliskII SheepShaver ati-x11-drv cinelerra gnuboy libmms libquicktime mplayer mplayerplug-in ogle snes9x vlc xmame xvidcore zvbi

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 31 13:16:20 CEST 2007


Author: thias
Date: 2007-05-31 13:16:17 +0200 (Thu, 31 May 2007)
New Revision: 5461

Modified:
   trunk/rpms/BasiliskII/BasiliskII.spec
   trunk/rpms/SheepShaver/SheepShaver.spec
   trunk/rpms/ati-x11-drv/ati-x11-drv.spec
   trunk/rpms/cinelerra/cinelerra.spec
   trunk/rpms/gnuboy/gnuboy.spec
   trunk/rpms/libmms/libmms.spec
   trunk/rpms/libquicktime/libquicktime.spec
   trunk/rpms/mplayer/mplayer.spec
   trunk/rpms/mplayerplug-in/mplayerplug-in.spec
   trunk/rpms/ogle/ogle.spec
   trunk/rpms/snes9x/snes9x.spec
   trunk/rpms/vlc/vlc.spec
   trunk/rpms/xmame/xmame.spec
   trunk/rpms/xvidcore/xvidcore.spec
   trunk/rpms/zvbi/zvbi.spec
Log:
Many but minor tweaks for Fedora 7 building.


Modified: trunk/rpms/BasiliskII/BasiliskII.spec
===================================================================
--- trunk/rpms/BasiliskII/BasiliskII.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/BasiliskII/BasiliskII.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -11,6 +11,7 @@
 
 %{!?dist:%define _with_banks 1}
 %{?el5:  %define _with_banks 1}
+%{?fc7:  %define _with_banks 1}
 %{?fc6:  %define _with_banks 1}
 %{?fc5:  %define _with_banks 1}
 %{?fc4:  %define _with_banks 1}
@@ -19,6 +20,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 

Modified: trunk/rpms/SheepShaver/SheepShaver.spec
===================================================================
--- trunk/rpms/SheepShaver/SheepShaver.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/SheepShaver/SheepShaver.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 

Modified: trunk/rpms/ati-x11-drv/ati-x11-drv.spec
===================================================================
--- trunk/rpms/ati-x11-drv/ati-x11-drv.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/ati-x11-drv/ati-x11-drv.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -215,7 +215,7 @@
 
 
 %clean
-#{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post

Modified: trunk/rpms/cinelerra/cinelerra.spec
===================================================================
--- trunk/rpms/cinelerra/cinelerra.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/cinelerra/cinelerra.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
 %{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
@@ -39,7 +40,7 @@
 BuildRequires: a52dec-devel
 BuildRequires: lame-devel
 BuildRequires: libsndfile-devel
-BuildRequires: openexr-devel
+BuildRequires: OpenEXR-devel
 BuildRequires: faad2-devel
 BuildRequires: libraw1394-devel >= 1.2.0
 BuildRequires: libiec61883-devel

Modified: trunk/rpms/gnuboy/gnuboy.spec
===================================================================
--- trunk/rpms/gnuboy/gnuboy.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/gnuboy/gnuboy.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
 %{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 

Modified: trunk/rpms/libmms/libmms.spec
===================================================================
--- trunk/rpms/libmms/libmms.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/libmms/libmms.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -51,7 +51,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING.LIB ChangeLog NEWS README* TODO
+%doc AUTHORS COPYING.LIB ChangeLog README* TODO
 %{_libdir}/*.so.*
 
 %files devel

Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/libquicktime/libquicktime.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -7,6 +7,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
 %{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 

Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/mplayer/mplayer.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
@@ -269,7 +270,7 @@
 
 
 %clean
-#{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %files
@@ -350,8 +351,8 @@
 - Update live library to 2006.07.04.
 
 * Fri Jun 23 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.28.pre8
-- Move location where binary codecs are searched for from %{_libdir}/win32/ to
-  %{_libdir}/codecs/ since "win32" is considered obsolete by MPlayer. Looks
+- Move location where binary codecs are searched for from %%{_libdir}/win32/ to
+  %%{_libdir}/codecs/ since "win32" is considered obsolete by MPlayer. Looks
   like codecs in the old location are still picked up automatically!
 
 * Thu Jun 22 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.27.pre8
@@ -547,7 +548,7 @@
 * Mon Jun 16 2003 Matthias Saou <http://freshrpms.net/>
 - Update to today's cvs snapshot.
 - Reverted Requires(...) to plain Requires.
-- Changed %pre / %post to -p.
+- Changed %%pre / %%post to -p.
 - Added libpostproc install workaround since it seems broken.
 
 * Mon Apr 28 2003 Matthias Saou <http://freshrpms.net/>
@@ -680,7 +681,7 @@
 - Added 3 skins + removed workaround since skin archives are fixed.
 
 * Wed Jan  2 2002 Matthias Saou <http://freshrpms.net/>
-- %doc cleanup and update to today's build.
+- %%doc cleanup and update to today's build.
 - Modified for the new CONFDIR stuff.
 
 * Wed Dec 12 2001 Matthias Saou <http://freshrpms.net/>

Modified: trunk/rpms/mplayerplug-in/mplayerplug-in.spec
===================================================================
--- trunk/rpms/mplayerplug-in/mplayerplug-in.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/mplayerplug-in/mplayerplug-in.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -10,6 +10,7 @@
 %define mozilla seamonkey
 %{!?dist:%define mozilla firefox}
 %{?el5:%define mozilla firefox}
+%{?fc7:%define mozilla firefox}
 %{?fc6:%define mozilla firefox}
 
 %{?fc4:%define _without_modxorg 1}

Modified: trunk/rpms/ogle/ogle.spec
===================================================================
--- trunk/rpms/ogle/ogle.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/ogle/ogle.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -9,6 +9,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 

Modified: trunk/rpms/snes9x/snes9x.spec
===================================================================
--- trunk/rpms/snes9x/snes9x.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/snes9x/snes9x.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 

Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/vlc/vlc.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -100,7 +100,7 @@
 Summary: The VideoLAN client, also a very good standalone video player
 Name: vlc
 Version: 0.8.6b
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.videolan.org/
@@ -170,6 +170,7 @@
 #{!?_without_goom:BuildRequires: goom-devel}
 %{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{!?_without_sysfs:BuildRequires: libsysfs-devel}
+#{!?_without_dc1394:BuildRequires: libdc1394-devel}
 Obsoletes: videolan-client < 0.8.5-4
 Provides: videolan-client = %{version}-%{release}
 
@@ -294,6 +295,7 @@
     %{!?_without_upnp:--enable-upnp} \
     %{!?_without_live:--enable-live555 --with-live555-tree="`pwd`/live"} \
     %{!?_without_jack:--enable-jack}
+    #{!?_without_dc1394:--enable-dc1394}
     #{!?_without_goom:--enable-goom} \
 %{__make} %{?_smp_mflags}
 
@@ -309,12 +311,13 @@
 %{__cp} -ap %{buildroot}%{_datadir}/vlc/vlc48x48.png \
     %{buildroot}%{_datadir}/pixmaps/vlc.png
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS
 %doc _docs/*
 %{_bindir}/*vlc
@@ -325,7 +328,7 @@
 %{_datadir}/vlc/
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc HACKING
 %{_bindir}/vlc-config
 %{_includedir}/vlc/
@@ -333,6 +336,10 @@
 
 
 %changelog
+* Thu May 31 2007 Matthias Saou <http://freshrpms.net/> 0.8.6b-2
+- Still no dc1394 support.
+- F7 rebuild.
+
 * Sat Apr 21 2007 Dag Wieers <dag at wieers.com> - 0.8.6b-1
 - Updated to release 0.8.6b.
 

Modified: trunk/rpms/xmame/xmame.spec
===================================================================
--- trunk/rpms/xmame/xmame.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/xmame/xmame.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 

Modified: trunk/rpms/xvidcore/xvidcore.spec
===================================================================
--- trunk/rpms/xvidcore/xvidcore.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/xvidcore/xvidcore.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -1,8 +1,8 @@
 # $Id$
 # Authority: matthias
 
-%define somaj  4
-%define somin  1
+%define somaj 4
+%define somin 1
 
 %{?dist: %{expand: %%define %dist 1}}
 

Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec	2007-05-31 11:11:33 UTC (rev 5460)
+++ trunk/rpms/zvbi/zvbi.spec	2007-05-31 11:16:17 UTC (rev 5461)
@@ -6,6 +6,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 




More information about the commits mailing list