[svn] r5172 - in trunk/rpms: arc dosbox

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-02-14 22:44:18 +0100 (Wed, 14 Feb 2007)
New Revision: 5172

Modified:
   trunk/rpms/arc/arc.spec
   trunk/rpms/dosbox/dosbox.spec
Log:
Updates

Modified: trunk/rpms/arc/arc.spec
===================================================================
--- trunk/rpms/arc/arc.spec	2007-02-14 19:54:28 UTC (rev 5171)
+++ trunk/rpms/arc/arc.spec	2007-02-14 21:44:18 UTC (rev 5172)
@@ -27,7 +27,7 @@
 %{__install} -Dp -m0755 arc %{buildroot}%{_bindir}/arc
 %{__install} -Dp -m0755 marc %{buildroot}%{_bindir}/marc
 %{__install} -Dp -m0644 arc.1 %{buildroot}%{_mandir}/man1/arc.1
-%{__install} -Dp -m0644 arc.1 %{buildroot}%{_mandir}/man1/marc.1
+%{__install} -Dp -m0644 marc.1 %{buildroot}%{_mandir}/man1/marc.1
 
 %clean
 %{__rm} -rf %{buildroot}

Modified: trunk/rpms/dosbox/dosbox.spec
===================================================================
--- trunk/rpms/dosbox/dosbox.spec	2007-02-14 19:54:28 UTC (rev 5171)
+++ trunk/rpms/dosbox/dosbox.spec	2007-02-14 21:44:18 UTC (rev 5172)
@@ -1,6 +1,24 @@
 # $Id$
 # Authority: dag
 
+%{!?dist:%define _with_modxorg 1}
+%{!?dist:%define _with_avahi 1}
+   
+%{?fc7:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
+%{?fc5:%define _with_modxorg 1}
+
+%{?el3:%define _without_alsa 1}
+%{?rh9:%define _without_alsa 1}
+
+%{?rh7:%define _without_alsa 1}
+%{?rh7:%define _without_freedesktop 1}
+
+%{?el2:%define _without_alsa 1}
+%{?el2:%define _without_freedesktop 1}
+
+%define desktop_vendor rpmforge
+
 Summary: x86/DOS emulator with sound/graphics
 Name: dosbox
 Version: 0.65
@@ -13,8 +31,11 @@
 Source1: dosbox.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: libpng-devel, SDL-devel, alsa-lib-devel, xorg-x11-devel
-BuildRequires: desktop-file-utils
+BuildRequires: libpng-devel, SDL-devel
+%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+%{?_with_modxorg:BuildRequires: xorg-x11-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
+%{!?_without_alsa:BuildRequires: alsa-lib-devel}
 
 %description
 DOSBox is a DOS-emulator using SDL for easy portability to different
@@ -43,6 +64,7 @@
 
 %build
 %configure \
+	--program-prefix="%{?_program_prefix}" \
 	--enable-shots
 %{__make} %{?_smp_mflags}
 
@@ -69,7 +91,8 @@
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS
 %doc %{_mandir}/man1/dosbox.1*
 %{_bindir}/dosbox
-%{_datadir}/applications/%{desktop_vendor}-dosbox.desktop
+%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-dosbox.desktop}
+%{?_without_freedesktop:/etc/X11/applnk/Applications/dosbox.desktop}
 %{_datadir}/pixmaps/dosbox.png
 
 %changelog