[egoboo/f17] Revert "Wrapper usage was incorrect"
Bruno Wolff III
bruno at fedoraproject.org
Fri Apr 27 04:24:30 UTC 2012
commit e230a5fdc242d23521288592c78055d38cc5408b
Author: Bruno Wolff III <bruno at wolff.to>
Date: Thu Apr 26 23:09:16 2012 -0500
Revert "Wrapper usage was incorrect"
This reverts commit a93edc41de3cc97a1360df23349dafecba5de9ed.
egoboo.desktop | 2 +-
egoboo.spec | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/egoboo.desktop b/egoboo.desktop
index 0385b06..bcf8e3a 100644
--- a/egoboo.desktop
+++ b/egoboo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Egoboo
Comment=A top down graphical (3D) RPG in the spirit of Nethack
-Exec=egoboo-wrapper.sh
+Exec=opengl-game-wrapper.sh
Icon=egoboo
Terminal=false
StartupNotify=false
diff --git a/egoboo.spec b/egoboo.spec
index 81bb387..cf1ea74 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -41,9 +41,10 @@ sed -i 's/\r//g' BUGS.txt license.txt setup.txt controls.txt
%install
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m 755 src/game/%{name}-2.x $RPM_BUILD_ROOT%{_libexecdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 src/game/%{name}-2.x $RPM_BUILD_ROOT%{_bindir}/%{name}
-ln -s %{_bindir}/opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper.sh
+ln -s %{_bindir}/opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -m 644 setup.txt $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -59,7 +60,7 @@ desktop-file-install --vendor fedora \
%files
# note the end-users docs are in the -data package
%{_bindir}/%{name}
-%{_bindir}/%{name}-wrapper.sh
+%{_libexecdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*
More information about the scm-commits
mailing list