rpms/rocksndiamonds/F-7 rocksndiamonds-3.2.3-music-info-url.patch, NONE, 1.1 rocksndiamonds.spec, 1.7, 1.8 sources, 1.5, 1.6
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue Aug 14 20:52:07 UTC 2007
- Previous message (by thread): rpms/python-memcached/devel .cvsignore, 1.3, 1.4 python-memcached.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/rocksndiamonds/FC-6 rocksndiamonds-3.2.3-music-info-url.patch, NONE, 1.1 rocksndiamonds.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/rocksndiamonds/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24901/F-7
Modified Files:
rocksndiamonds.spec sources
Added Files:
rocksndiamonds-3.2.3-music-info-url.patch
Log Message:
Fixup non-devel branches
rocksndiamonds-3.2.3-music-info-url.patch:
--- NEW FILE rocksndiamonds-3.2.3-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(ystart + y++ * dy, FONT_TEXT_2, list->url_header);
+ else
+ DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "from the website");
+ DrawTextFCentered(ystart + 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: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-7/rocksndiamonds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rocksndiamonds.spec 18 Jan 2007 17:21:20 -0000 1.7
+++ rocksndiamonds.spec 14 Aug 2007 20:51:35 -0000 1.8
@@ -1,16 +1,19 @@
Name: rocksndiamonds
Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}.1
License: GPL
Group: Amusements/Games
Summary: Underground digging game
URL: http://www.artsoft.org/rocksndiamonds/
-Source0: http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-%{version}.tar.gz
+# Upstream source has music used without permission
+# Source0: http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-%{version}.tar.gz
+Source0: rocksndiamonds-%{version}-clean.tar.gz
Source1: rocksndiamonds.desktop
Source2: rocksndiamonds.png
Patch0: rocksndiamonds-3.1.1-nosmpeg.patch
Patch1: rocksndiamonds-highscore.patch
Patch2: rocksndiamonds-YN.patch
+Patch3: rocksndiamonds-3.2.3-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
@@ -24,6 +27,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
@@ -65,6 +69,10 @@
%{_mandir}/man1/*
%changelog
+* Tue Aug 14 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.3-2
+- use clean tarball
+- patch in support for displaying url on music info page
+
* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.3-1
- bump to 3.2.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Jan 2007 17:21:20 -0000 1.5
+++ sources 14 Aug 2007 20:51:35 -0000 1.6
@@ -1 +1 @@
-9e206899bdb5cddebf504d47bd75d62b rocksndiamonds-3.2.3.tar.gz
+5a57a0f6251e3eae52c941ef0f95fda8 rocksndiamonds-3.2.3-clean.tar.gz
- Previous message (by thread): rpms/python-memcached/devel .cvsignore, 1.3, 1.4 python-memcached.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/rocksndiamonds/FC-6 rocksndiamonds-3.2.3-music-info-url.patch, NONE, 1.1 rocksndiamonds.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list