Attachment 4984 Details for Bug 12599 – dosbox.diff

[patch] dosbox.diff

dosbox.diff (text/plain), 2.59 KB, created by Alex Loginov on 2014-02-13 12:31:20 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Loginov

Created: 2014-02-13 12:31:20 CET

Size: 2.59 KB

patch

obsolete

>Index: SOURCES/dosbox-set-locale_config.sh
>===================================================================
>--- SOURCES/dosbox-set-locale_config.sh	(revision 590385)
>+++ SOURCES/dosbox-set-locale_config.sh	(working copy)
>@@ -28,19 +28,19 @@
> esac
> echo -e "Locale detected:\t$yourlocale";
> echo -e "Locale file to use:\t$DOSBoxfile";
>-if [ ! -e ~/.dosbox/dosbox-0.74.conf ]; then
>+if [ ! -e ~/.dosbox/$DOSBoxconf ]; then
> 	mkdir `env | grep -w HOME | cut -d= -f2`/.dosbox/
> 	cp /usr/share/dosbox/template/$DOSBoxconf `env | grep -w HOME | cut -d= -f2`/.dosbox/
> 	chmod 0664 `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
>-	sed -i -e 's|language=|language=/usr/share/dosbox/i18n/'"$DOSBoxfile"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
>-	sed -i -e 's|keyboardlayout=|keyboardlayout='"$yourlocale"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
>+	sed -i -e 's|^language=.*|language=/usr/share/dosbox/i18n/'"$DOSBoxfile"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
>+	sed -i -e 's|^keyboardlayout=.*|keyboardlayout='"$yourlocale"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
> else
> 	echo "Your configuration file already exists!";
> 	echo -e "You can configure:\t`env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf";
> 	echo -e "for your locale:\tlanguage=/usr/share/dosbox/i18n/$DOSBoxfile"
> 	echo -e "for your keyboard:\tkeyboardlayout=$yourlocale";
> fi
>-dosbox
>+exec dosbox "$@"
> else
> 	echo "Please do not run this application as 'root'!";
> fi
>Index: SPECS/dosbox.spec
>===================================================================
>--- SPECS/dosbox.spec	(revision 590385)
>+++ SPECS/dosbox.spec	(working copy)
>@@ -1,6 +1,6 @@
> Name:		dosbox
> Version:	0.74
>-Release:	%mkrel 8
>+Release:	%mkrel 9
> Summary:	Free Open Source DOS emulator to run old DOS games
> Source0:	http://prdownloads.sourceforge.net/dosbox/%{name}-%{version}.tar.bz2
> # mga#12599
>@@ -59,8 +59,9 @@
> cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
> [Desktop Entry]
> Name=DOSBox
>-Comment=DOS emulator to run old DOS games
>-Exec=%{name}-set-locale_config.sh
>+Comment=DOS emulator to run old DOS programs
>+Comment[ru]=ÐÐ¼ÑÐ»ÑÑÐ¾Ñ DOS Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ°ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ DOS
>+Exec=%{name}-set-locale_config.sh %%U
> Icon=%{name}
> Terminal=false
> Type=Application
>@@ -72,7 +73,7 @@
> install -m 0644 %{name}.png -D %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{name}.png
> 
> %files
>-%doc AUTHORS ChangeLog NEWS README THANKS
>+%doc AUTHORS ChangeLog NEWS README THANKS docs/README.video
> %defattr(755,root,root,755)
> %{_bindir}/%{name}
> %{_bindir}/%{name}-set-locale_config.sh

Index: SOURCES/dosbox-set-locale_config.sh
===================================================================
--- SOURCES/dosbox-set-locale_config.sh	(revision 590385)
+++ SOURCES/dosbox-set-locale_config.sh	(working copy)
@@ -28,19 +28,19 @@
 esac
 echo -e "Locale detected:\t$yourlocale";
 echo -e "Locale file to use:\t$DOSBoxfile";
-if [ ! -e ~/.dosbox/dosbox-0.74.conf ]; then
+if [ ! -e ~/.dosbox/$DOSBoxconf ]; then
 	mkdir `env | grep -w HOME | cut -d= -f2`/.dosbox/
 	cp /usr/share/dosbox/template/$DOSBoxconf `env | grep -w HOME | cut -d= -f2`/.dosbox/
 	chmod 0664 `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
-	sed -i -e 's|language=|language=/usr/share/dosbox/i18n/'"$DOSBoxfile"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
-	sed -i -e 's|keyboardlayout=|keyboardlayout='"$yourlocale"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
+	sed -i -e 's|^language=.*|language=/usr/share/dosbox/i18n/'"$DOSBoxfile"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
+	sed -i -e 's|^keyboardlayout=.*|keyboardlayout='"$yourlocale"'|g' `env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf
 else
 	echo "Your configuration file already exists!";
 	echo -e "You can configure:\t`env | grep -w HOME | cut -d= -f2`/.dosbox/$DOSBoxconf";
 	echo -e "for your locale:\tlanguage=/usr/share/dosbox/i18n/$DOSBoxfile"
 	echo -e "for your keyboard:\tkeyboardlayout=$yourlocale";
 fi
-dosbox
+exec dosbox "$@"
 else
 	echo "Please do not run this application as 'root'!";
 fi
Index: SPECS/dosbox.spec
===================================================================
--- SPECS/dosbox.spec	(revision 590385)
+++ SPECS/dosbox.spec	(working copy)
@@ -1,6 +1,6 @@
 Name:		dosbox
 Version:	0.74
-Release:	%mkrel 8
+Release:	%mkrel 9
 Summary:	Free Open Source DOS emulator to run old DOS games
 Source0:	http://prdownloads.sourceforge.net/dosbox/%{name}-%{version}.tar.bz2
 # mga#12599
@@ -59,8 +59,9 @@
 cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Name=DOSBox
-Comment=DOS emulator to run old DOS games
-Exec=%{name}-set-locale_config.sh
+Comment=DOS emulator to run old DOS programs
+Comment[ru]=ÐÐ¼ÑÐ»ÑÑÐ¾Ñ DOS Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ°ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ DOS
+Exec=%{name}-set-locale_config.sh %%U
 Icon=%{name}
 Terminal=false
 Type=Application
@@ -72,7 +73,7 @@
 install -m 0644 %{name}.png -D %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{name}.png
 
 %files
-%doc AUTHORS ChangeLog NEWS README THANKS
+%doc AUTHORS ChangeLog NEWS README THANKS docs/README.video
 %defattr(755,root,root,755)
 %{_bindir}/%{name}
 %{_bindir}/%{name}-set-locale_config.sh

Actions: View | Diff

Attachments on bug 12599: 4957 | 4958 | 4959 | 4984