7:12 p.m.
Author: sergiomb
Update of /cvs/free/rpms/ltris/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32230
Modified Files:
.cvsignore ltris.spec sources
Added Files:
ltris-1.0.19-inlines.patch
Log Message:
* Mon May 11 2015 Sérgio Basto <sergio(a)serjux.com> - 1.0.19-1
- Update to 1.0.19 .
- Added inlines.patch that fix FTBFS on F22 rfbz #3623.
- Added autoreconf -fiv .
- Added and use .desktop file and ltris icon from sources.
- Removed BR ImageMagick and convert comand to generate icon.
- Removed snipset that generate .desktop file.
- Clean spec file.
ltris-1.0.19-inlines.patch:
sdl.h | 20 ++++++++++----------
tools.h | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE ltris-1.0.19-inlines.patch ---
diff -rup ltris-1.0.19.orig/src/sdl.h ltris-1.0.19/src/sdl.h
--- ltris-1.0.19.orig/src/sdl.h 2013-05-03 18:13:11.000000000 +0100
+++ ltris-1.0.19/src/sdl.h 2015-05-11 18:54:37.949653509 +0100
@@ -41,8 +41,8 @@ typedef struct {
SDL_Surface* load_surf(char *fname, int f);
SDL_Surface* create_surf(int w, int h, int f);
void free_surf( SDL_Surface **surf );
-inline void lock_surf(SDL_Surface *sur);
-inline void unlock_surf(SDL_Surface *sur);
+extern void lock_surf(SDL_Surface *sur);
+extern void unlock_surf(SDL_Surface *sur);
void blit_surf(void);
void alpha_blit_surf(int alpha);
void fill_surf(int c);
@@ -86,8 +86,8 @@ Font* load_font(char *fname);
Font* load_fixed_font(char *fname, int off, int len, int w);
void free_font(Font **sfnt);
int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha);
-inline void lock_font(Font *sfnt);
-inline void unlock_font(Font *sfnt);
+extern void lock_font(Font *sfnt);
+extern void unlock_font(Font *sfnt);
SDL_Rect last_write_rect(Font *fnt);
int text_width(Font *fnt, char *str);
@@ -132,14 +132,14 @@ Video_Mode* cur_video_mode();
char** get_mode_names( int *count );
int set_video_mode( Video_Mode mode );
void hardware_cap();
-inline void refresh_screen( int x, int y, int w, int h );
+extern void refresh_screen( int x, int y, int w, int h );
void refresh_rects();
void add_refresh_rect(int x, int y, int w, int h);
int wait_for_key();
void wait_for_click();
-inline void lock_screen();
-inline void unlock_screen();
-inline void flip_screen();
+extern void lock_screen();
+extern void unlock_screen();
+extern void flip_screen();
void fade_screen( int type, int ms );
void take_screenshot( int i );
@@ -148,8 +148,8 @@ void take_screenshot( int i );
SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
/* timer */
-inline int get_time();
-inline void reset_timer();
+extern int get_time();
+extern void reset_timer();
#ifdef __cplusplus
};
diff -rup ltris-1.0.19.orig/src/tools.h ltris-1.0.19/src/tools.h
--- ltris-1.0.19.orig/src/tools.h 2013-05-03 18:13:11.000000000 +0100
+++ ltris-1.0.19/src/tools.h 2015-05-11 18:48:11.099638130 +0100
@@ -33,7 +33,7 @@
#define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + (
vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 );
+extern int strequal( char *str1, char *str2 );
/* delete lines */
void delete_lines( char **lines, int line_number );
@@ -45,16 +45,16 @@ typedef struct {
} Delay;
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms );
+extern void delay_set( Delay *delay, int ms );
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay );
+extern void delay_reset( Delay *delay );
/* check if time's out ( add ms milliseconds )and reset */
-inline int delay_timed_out( Delay *delay, int ms );
+extern int delay_timed_out( Delay *delay, int ms );
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay );
+extern void delay_force_time_out( Delay *delay );
/* return distance betwteen to map positions */
int get_dist( int x1, int y1, int x2, int y2 );
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ltris/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2008 14:01:05 -0000 1.2
+++ .cvsignore 11 May 2015 19:12:49 -0000 1.3
@@ -1 +1 @@
-ltris-1.0.12.tar.gz
+ltris-1.0.19.tar.gz
Index: ltris.spec
===================================================================
RCS file: /cvs/free/rpms/ltris/devel/ltris.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ltris.spec 31 Aug 2014 04:21:33 -0000 1.6
+++ ltris.spec 11 May 2015 19:12:49 -0000 1.7
@@ -1,16 +1,15 @@
-%define desktop_vendor rpmforge
-
Summary: Game of skill with falling blocks
Name: ltris
-Version: 1.0.12
-Release: 7%{?dist}
+Version: 1.0.19
+Release: 1%{?dist}
License: GPL
Group: Amusements/Games
URL: http://lgames.sourceforge.net/
Source: http://dl.sf.net/lgames/%{name}-%{version}.tar.gz
+Patch1: ltris-1.0.19-inlines.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: SDL >= 1.1.4, SDL_mixer
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils, ImageMagick
+BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
%description
LTris as a tetris clone which means you have a bowl with blocks falling down.
@@ -24,43 +23,25 @@
%prep
%setup
+%patch1 -p1
%build
+autoreconf -fiv
%configure --localstatedir=%{_var}/lib/games
%{__make} %{?_smp_mflags}
-# Having it as png seems more consistent
-convert icons/ltris48.xpm ltris.png
%install
-%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%find_lang %{name}
-%{__install} -D -p ltris.png %{buildroot}%{_datadir}/pixmaps/ltris.png
-
-%{__cat} > %{name}.desktop << EOF
-[Desktop Entry]
-Name=LTris
-Comment=Tetris clone
-Exec=ltris
-Icon=ltris.png
-Terminal=false
-Type=Application
-Categories=Application;Game;
-Encoding=UTF-8
-EOF
%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
+desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
-%clean
-%{__rm} -rf %{buildroot}
-
-
%post
update-desktop-database %{_datadir}/applications &>/dev/null || :
@@ -72,13 +53,22 @@
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog README TODO
%attr(2551, root, games) %{_bindir}/ltris
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/ltris48.gif
%{_datadir}/ltris/
-%{_datadir}/pixmaps/ltris.png
%config(noreplace) %attr(664, root, games) %{_localstatedir}/lib/games/ltris.hscr
%changelog
+* Mon May 11 2015 Sérgio Basto <sergio(a)serjux.com> - 1.0.19-1
+- Update to 1.0.19 .
+- Added inlines.patch that fix FTBFS on F22 rfbz #3623.
+- Added autoreconf -fiv .
+- Added and use .desktop file and ltris icon from sources.
+- Removed BR ImageMagick and convert comand to generate icon.
+- Removed snipset that generate .desktop file.
+- Clean spec file.
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.0.12-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ltris/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2008 14:01:05 -0000 1.2
+++ sources 11 May 2015 19:12:49 -0000 1.3
@@ -1 +1 @@
-53b00c17a05c438602a52009e65ebde2 ltris-1.0.12.tar.gz
+63486b90e59699823f7093bc9ab87725 ltris-1.0.19.tar.gz