rpms/uqm/devel uqm.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 uqm-optflags.patch, 1.1, 1.2 uqm.spec, 1.6, 1.7 uqm-comms-bluescreen.patch, 1.1, NONE uqm-config.patch, 1.1, NONE uqm-decls.patch, 1.1, NONE uqm-gcc34MM.patch, 1.1, NONE uqm-lvalues.patch, 1.2, NONE uqm-macros.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue May 24 06:42:31 UTC 2005
Author: scop
Update of /cvs/extras/rpms/uqm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317
Modified Files:
.cvsignore sources uqm-optflags.patch uqm.spec
Added Files:
uqm.sh
Removed Files:
uqm-comms-bluescreen.patch uqm-config.patch uqm-decls.patch
uqm-gcc34MM.patch uqm-lvalues.patch uqm-macros.patch
Log Message:
0.4.0, FHS compliant install layout.
--- NEW FILE uqm.sh ---
#!/bin/sh
# Wrapper script for starting The Ur-Quan Masters
# Source system wide settings
if [ -e /etc/uqm.conf ] ; then
. /etc/uqm.conf
fi
# Source per-user settings
if [ -e "$HOME/.uqm/uqm.conf" ] ; then
. "$HOME/.uqm/uqm.conf"
fi
exec /usr/games/uqm $UQM_OPTS "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:30:18 -0000 1.2
+++ .cvsignore 24 May 2005 06:42:28 -0000 1.3
@@ -1 +1 @@
-uqm-0.3-source.tgz
+uqm-0.4.0-source.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:30:18 -0000 1.2
+++ sources 24 May 2005 06:42:29 -0000 1.3
@@ -1 +1 @@
-6abcdc3caf7efd3bd978332743ee7568 uqm-0.3-source.tgz
+17c2007297c9549916c452598dfc4235 uqm-0.4.0-source.tar.gz
uqm-optflags.patch:
Index: uqm-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm-optflags.patch 8 Nov 2004 05:30:18 -0000 1.1
+++ uqm-optflags.patch 24 May 2005 06:42:29 -0000 1.2
@@ -1,20 +1,20 @@
---- build/unix/build.config.orig 2003-09-06 18:08:49.000000000 +0300
-+++ build/unix/build.config 2003-09-06 22:07:34.000000000 +0300
-@@ -52,7 +52,7 @@
- CHOICE_debug_OPTION_nodebug_TITLE="No debugging information"
- CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action'
- nodebug_action() {
-- CFLAGS="$CFLAGS -O3"
-+ CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
- DEBUG=0
- }
- CHOICE_debug_OPTION_debug_TITLE="Debugging information"
-@@ -93,7 +93,7 @@
- # for more readable messages.
- DEBUG=0
- }
--CHOICE_debug_DEFAULT=debug
-+CHOICE_debug_DEFAULT=nodebug
+--- build/unix/build.config~ 2005-05-19 04:11:25.000000000 +0300
++++ build/unix/build.config 2005-05-21 23:30:40.000000000 +0300
+@@ -81,7 +81,7 @@
+ CHOICE_debug_OPTION_nodebug_TITLE="No debugging information"
+ CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action'
+ nodebug_action() {
+- CFLAGS="$CFLAGS -O3"
++ CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+ DEBUG=0
+ }
+ CHOICE_debug_OPTION_debug_TITLE="Debugging information"
+@@ -122,7 +122,7 @@
+ # for more readable messages.
+ DEBUG=1
+ }
+- CHOICE_debug_DEFAULT=debug
++ CHOICE_debug_DEFAULT=nodebug
- CHOICE_graphics_OPTIONS="pure opengl"
- CHOICE_graphics_TITLE="OpenGL graphics support"
+ CHOICE_graphics_OPTIONS="pure opengl"
+ CHOICE_graphics_TITLE="OpenGL graphics support"
Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- uqm.spec 18 Mar 2005 13:20:40 -0000 1.6
+++ uqm.spec 24 May 2005 06:42:29 -0000 1.7
@@ -1,28 +1,21 @@
Name: uqm
-Version: 0.3
-Release: 4
+Version: 0.4.0
+Release: 1
Summary: The Ur-Quan Masters, a port of the classic game Star Control II
Group: Amusements/Games
License: GPL
URL: http://sc2.sourceforge.net/
-Source0: http://download.sourceforge.net/sc2/uqm-0.3-source.tgz
+Source0: http://download.sf.net/sc2/%{name}-%{version}-source.tar.gz
Source1: %{name}.conf
-Source2: %{name}.desktop
-Patch0: %{name}-config.patch
-Patch1: %{name}-optflags.patch
-# Patch2: http://uqm.stack.nl/cgi-bin/bugs/show_bug.cgi?id=363#c20
-Patch2: %{name}-comms-bluescreen.patch
-Patch3: %{name}-gcc34MM.patch
-Patch4: %{name}-decls.patch
-Patch5: %{name}-lvalues.patch
-Patch6: %{name}-macros.patch
+Source2: %{name}.sh
+Source3: %{name}.desktop
+Patch0: %{name}-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel >= 1.2.3, SDL_image-devel, SDL_mixer-devel
-BuildRequires: libvorbis-devel, zlib-devel, perl, desktop-file-utils
-BuildRequires: ImageMagick
-Requires: %{name}-content >= 0.3
+BuildRequires: SDL-devel >= 1.2.3, SDL_image-devel, ImageMagick
+BuildRequires: libvorbis-devel, zlib-devel, sed, desktop-file-utils
+Requires: %{name}-content >= 0.4.0
%description
The Ur-Quan Masters is a port of the classic game Star Control II to
@@ -33,16 +26,12 @@
%prep
%setup -q
+find . -type d -name CVS | xargs rm -r
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
+echo INPUT_install_sharedir_VALUE=%{_datadir}/games > config.state
sh ./build.sh uqm < /dev/null
convert src/res/ur-quan-icon-std.ico uqm.png
@@ -50,30 +39,27 @@
%install
rm -rf $RPM_BUILD_ROOT
-perl -pi -e \
- "s|/usr/local/games/bin/|$RPM_BUILD_ROOT%{_bindir}/|g ;
- s|/usr/local/games/lib/|$RPM_BUILD_ROOT%{_libdir}/games/|g ;
- s|/usr/local/games/share/|$RPM_BUILD_ROOT%{_datadir}/games/|g" \
- build.vars
-
-sh ./build.sh uqm install
-
-perl -pi -e \
- 's|/usr/local/games/lib/uqm/uqm|%{_libdir}/games/uqm/uqm| ;
- s|/usr/local/games/share/uqm/content|%{_datadir}/games/uqm/content|g' \
- $RPM_BUILD_ROOT%{_bindir}/uqm
-
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/uqm.conf
-perl -pi -e 's|/etc/|%{_sysconfdir}/|g' $RPM_BUILD_ROOT%{_sysconfdir}/uqm.conf
+install -dm 755 $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}}
+sed -e 's|/etc/|%{_sysconfdir}/|' %{SOURCE1} > \
+ $RPM_BUILD_ROOT%{_sysconfdir}/uqm.conf
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/uqm.conf
+sed -e 's|/usr/games/|%{_prefix}/games/|' %{SOURCE2} \
+ > $RPM_BUILD_ROOT%{_bindir}/uqm
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/uqm
+
+install -Dpm 755 uqm $RPM_BUILD_ROOT%{_prefix}/games/uqm
+
+install -dm 755 \
+ $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/packages/addons/uqmremix
+echo %{version} > $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/version
desktop-file-install \
--vendor fedora \
--mode 644 \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
- %{SOURCE2}
-
-install -Dpm 644 uqm.png.5 $RPM_BUILD_ROOT%{_datadir}/pixmaps/uqm.png
+ %{SOURCE3}
+install -Dpm 644 uqm-5.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/uqm.png
%clean
@@ -86,13 +72,18 @@
%doc doc/users/manual.txt
%config(noreplace) %{_sysconfdir}/uqm.conf
%{_bindir}/uqm
-%{_libdir}/games/uqm
-%{_datadir}/games/uqm
+%{_prefix}/games/uqm
+%{_datadir}/games/uqm/
%{_datadir}/applications/*-%{name}.desktop
%{_datadir}/pixmaps/uqm.png
%changelog
+* Sun May 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.4.0-1
+- 0.4.0, most patches applied upstream.
+- Make install layout FHS compliant.
+- Make compiled in default content dir point to the right place.
+
* Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.3-4
- Fix FC4 build.
--- uqm-comms-bluescreen.patch DELETED ---
--- uqm-config.patch DELETED ---
--- uqm-decls.patch DELETED ---
--- uqm-gcc34MM.patch DELETED ---
--- uqm-lvalues.patch DELETED ---
--- uqm-macros.patch DELETED ---
More information about the fedora-extras-commits
mailing list