rpms/rocksndiamonds/devel rocksndiamonds-3.2.4-music-info-url.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 rocksndiamonds.spec, 1.12, 1.13 sources, 1.6, 1.7
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Wed Feb 20 18:54:36 UTC 2008
Author: spot
Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11538/devel
Modified Files:
.cvsignore rocksndiamonds.spec sources
Added Files:
rocksndiamonds-3.2.4-music-info-url.patch
Log Message:
Update to 3.2.4, rework so that music is in its own tarball.
rocksndiamonds-3.2.4-music-info-url.patch:
--- NEW FILE rocksndiamonds-3.2.4-music-info-url.patch ---
diff -up rocksndiamonds-3.2.3/src/screens.c.BAD rocksndiamonds-3.2.3/src/screens.c
--- rocksndiamonds-3.2.3/src/screens.c.BAD 2007-07-11 14:44:38.000000000 -0500
+++ rocksndiamonds-3.2.3/src/screens.c 2007-07-11 14:46:45.000000000 -0500
@@ -2123,7 +2123,15 @@ void HandleInfoScreen_Music(int button)
DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "%s", list->year);
}
+ if (!strEqual(list->url, UNKNOWN_NAME))
+ {
+ if (!strEqual(list->url_header, UNKNOWN_NAME))
+ DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->url_header);
+ else
+ DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the website");
+ DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->url);
+ }
DrawTextSCentered(ybottom, FONT_TEXT_4,
"Press any key or button for next page");
diff -up rocksndiamonds-3.2.3/src/main.h.BAD rocksndiamonds-3.2.3/src/main.h
--- rocksndiamonds-3.2.3/src/main.h.BAD 2007-07-11 14:43:51.000000000 -0500
+++ rocksndiamonds-3.2.3/src/main.h 2007-07-11 14:44:20.000000000 -0500
@@ -2399,11 +2399,13 @@ struct MusicFileInfo
char *artist_header;
char *album_header;
char *year_header;
+ char *url_header;
char *title;
char *artist;
char *album;
char *year;
+ char *url;
int music;
diff -up rocksndiamonds-3.2.3/src/files.c.BAD rocksndiamonds-3.2.3/src/files.c
--- rocksndiamonds-3.2.3/src/files.c.BAD 2007-07-11 14:42:05.000000000 -0500
+++ rocksndiamonds-3.2.3/src/files.c 2007-07-11 14:43:29.000000000 -0500
@@ -6800,11 +6800,13 @@ static struct MusicFileInfo *get_music_f
{ "artist_header", &tmp_music_file_info.artist_header },
{ "album_header", &tmp_music_file_info.album_header },
{ "year_header", &tmp_music_file_info.year_header },
+ { "url_header", &tmp_music_file_info.url_header },
{ "title", &tmp_music_file_info.title },
{ "artist", &tmp_music_file_info.artist },
{ "album", &tmp_music_file_info.album },
{ "year", &tmp_music_file_info.year },
+ { "url", &tmp_music_file_info.url },
{ NULL, NULL },
};
@@ -6928,11 +6930,13 @@ void LoadMusicInfo()
checked_free(music_file_info->artist_header);
checked_free(music_file_info->album_header);
checked_free(music_file_info->year_header);
+ checked_free(music_file_info->url_header);
checked_free(music_file_info->title);
checked_free(music_file_info->artist);
checked_free(music_file_info->album);
checked_free(music_file_info->year);
+ checked_free(music_file_info->url);
free(music_file_info);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 14 Aug 2007 20:22:05 -0000 1.6
+++ .cvsignore 20 Feb 2008 18:53:53 -0000 1.7
@@ -1,2 +1,4 @@
rocksndiamonds-3.2.3.tar.gz
rocksndiamonds-3.2.3-clean.tar.gz
+rocksndiamonds-3.2.4-clean.tar.gz
+rocksndiamonds-distributable-music.tar.bz2
Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rocksndiamonds.spec 20 Feb 2008 01:47:30 -0000 1.12
+++ rocksndiamonds.spec 20 Feb 2008 18:53:53 -0000 1.13
@@ -1,19 +1,24 @@
Name: rocksndiamonds
-Version: 3.2.3
-Release: 3%{?dist}.2
+Version: 3.2.4
+Release: 1%{?dist}
License: GPL+
Group: Amusements/Games
Summary: Underground digging game
URL: http://www.artsoft.org/rocksndiamonds/
# Upstream source has music used without permission
+# We remove it:
+# cd rocksndiamonds-*/music/mus_classic/
+# rm -rf alchemy.* chase.* czardasz.* network.* twilight.* tyger.* voyager.*
# Source0: http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-%{version}.tar.gz
Source0: rocksndiamonds-%{version}-clean.tar.gz
Source1: rocksndiamonds.desktop
Source2: rocksndiamonds.png
+# Music files we have permission for!
+Source3: rocksndiamonds-distributable-music.tar.bz2
Patch0: rocksndiamonds-3.1.1-nosmpeg.patch
Patch1: rocksndiamonds-highscore.patch
Patch2: rocksndiamonds-YN.patch
-Patch3: rocksndiamonds-3.2.3-music-info-url.patch
+Patch3: rocksndiamonds-3.2.4-music-info-url.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
BuildRequires: SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -23,7 +28,7 @@
rocks and strange creatures!
%prep
-%setup -q
+%setup -q -a 3
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -69,6 +74,10 @@
%{_mandir}/man1/*
%changelog
+* Wed Feb 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.4-1
+- update to 3.2.4
+- keep music in their own tarball
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.2.3-3.2
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 14 Aug 2007 20:22:05 -0000 1.6
+++ sources 20 Feb 2008 18:53:53 -0000 1.7
@@ -1 +1,2 @@
-5a57a0f6251e3eae52c941ef0f95fda8 rocksndiamonds-3.2.3-clean.tar.gz
+d4803571066862c9c8484b2b913381f8 rocksndiamonds-3.2.4-clean.tar.gz
+6a9a5ae28689254363c91716fbad1824 rocksndiamonds-distributable-music.tar.bz2
More information about the fedora-extras-commits
mailing list