rpms/uqm/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 uqm-optflags.patch, 1.2, 1.3 uqm.spec, 1.10, 1.11

[Konstantin Ryabitsev (icon)]

Author: icon

Update of /cvs/extras/rpms/uqm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/FC-6

Modified Files:
	.cvsignore sources uqm-optflags.patch uqm.spec 
Log Message:
Version 0.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uqm/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Feb 2006 13:28:33 -0000	1.4
+++ .cvsignore	22 Dec 2006 20:26:12 -0000	1.5
@@ -1 +1 @@
-uqm-0.5.0-source.tar.gz
+uqm-0.6.0-source.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uqm/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Feb 2006 13:28:33 -0000	1.4
+++ sources	22 Dec 2006 20:26:12 -0000	1.5
@@ -1 +1 @@
-9002b1bc2de9285588dd97b618a867a7  uqm-0.5.0-source.tar.gz
+898a71451f283763209c352f6455ee09  uqm-0.6.0-source.tgz

uqm-optflags.patch:

Index: uqm-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/uqm/FC-6/uqm-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uqm-optflags.patch	24 May 2005 06:42:29 -0000	1.2
+++ uqm-optflags.patch	22 Dec 2006 20:26:12 -0000	1.3
@@ -1,5 +1,5 @@
---- build/unix/build.config~	2005-05-19 04:11:25.000000000 +0300
-+++ build/unix/build.config	2005-05-21 23:30:40.000000000 +0300
+--- sc2/build/unix/build.config~	2005-05-19 04:11:25.000000000 +0300
++++ sc2/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'


Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/FC-6/uqm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- uqm.spec	3 Sep 2006 19:29:50 -0000	1.10
+++ uqm.spec	22 Dec 2006 20:26:12 -0000	1.11
@@ -1,20 +1,18 @@
 Name:           uqm
-Version:        0.5.0
-Release:        1.1%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 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.sf.net/sc2/%{name}-%{version}-source.tar.gz
+Source0:        http://download.sf.net/sc2/%{name}-%{version}-source.tgz
 Source1:        %{name}.conf
 Source2:        %{name}.sh
 Source3:        %{name}.desktop
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Exclude 64-bit archs, see bug 158705.
-ExcludeArch:    x86_64 ppc64 ia64 sparc64
 BuildRequires:  SDL-devel >= 1.2.8
 BuildRequires:  SDL_image-devel >= 1.2.4
 BuildRequires:  ImageMagick
@@ -22,7 +20,9 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGLU-devel
-Requires:       %{name}-content >= 0.5.0
+BuildRequires:  mikmod-devel
+Requires:       %{name}-content >= %{version}
+
 
 %description
 The Ur-Quan Masters is a port of the classic game Star Control II to
@@ -32,18 +32,20 @@
 
 
 %prep
-%setup -q
+%setup -q -c
 find . -type d -name CVS | xargs rm -r
 %patch0 -p0
 
 
 %build
+pushd sc2
 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
 
 
 %install
+pushd sc2
 rm -rf $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}}
@@ -75,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog Contributing COPYING README TODO WhatsNew
-%doc doc/users/manual.txt
+%doc sc2/AUTHORS sc2/ChangeLog sc2/Contributing sc2/COPYING sc2/README 
+%doc sc2/WhatsNew sc2/doc/users/manual.txt
 %config(noreplace) %{_sysconfdir}/uqm.conf
 %{_bindir}/uqm
 %{_prefix}/games/uqm
@@ -86,6 +88,11 @@
 
 
 %changelog
+* Fri Dec 22 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.0-1
+- Upstream 0.6.0
+- Don't exclude 64-bit arches
+- BR: mikmod-devel
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.5.0-1.1
 - FC6 rebuild