- updated to 0.5.3

- removed obsolete system-sdlgfx patch

diff --git a/guile-sdl-system-sdlgfx.patch b/guile-sdl-system-sdlgfx.patch
deleted file mode 100644 (file)
index c5da175..0000000
--- a/guile-sdl-system-sdlgfx.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- guile-sdl-0.4.3/src/sdlgfx.c.orig  2013-03-18 18:24:55.000000000 +0100
-+++ guile-sdl-0.4.3/src/sdlgfx.c       2013-04-24 16:57:08.435201056 +0200
-@@ -62,7 +62,7 @@
-  * gfxPrimitives
-  */
- 
--#include "SDL_gfx/SDL_gfxPrimitives.h"
-+#include "SDL/SDL_gfxPrimitives.h"
- 
- 
- PRIMPROC
-@@ -688,7 +688,7 @@
-  * rotozoom
-  */
- 
--#include "SDL_gfx/SDL_rotozoom.h"
-+#include "SDL/SDL_rotozoom.h"
- 
- 
- PRIMPROC
-@@ -824,7 +824,7 @@
-  * framerate
-  */
- 
--#include "SDL_gfx/SDL_framerate.h"
-+#include "SDL/SDL_framerate.h"
- 
- static long fpsmgr_tag;
- 
-@@ -943,7 +943,7 @@
-  * RGBA extras
-  */
- 
--#include "SDL_gfx/SDL_gfxBlitFunc.h"
-+#include "SDL/SDL_gfxBlitFunc.h"
- 
- 
- PRIMPROC
-@@ -997,7 +997,7 @@
-  * image filter
-  */
- 
--#include "SDL_gfx/SDL_imageFilter.h"
-+#include "SDL/SDL_imageFilter.h"
- 
- PRIMPROC
- (imfi_mmx_p, "imfi-mmx?", 0, 1, 0,
---- guile-sdl-0.5.0/src/Makefile.am.orig       2013-07-10 12:17:16.000000000 +0200
-+++ guile-sdl-0.5.0/src/Makefile.am    2013-07-24 17:26:51.596567438 +0200
-@@ -18,7 +18,7 @@
- ## Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA  02110-1301  USA
- 
--SUBDIRS = SDL_gfx k
-+SUBDIRS = k
- 
- AM_CPPFLAGS = $(SDL_CFLAGS)
- AM_CFLAGS = $(NORMAL_CFLAGS)
-@@ -85,13 +85,13 @@
- 
- gfx_la_SOURCES  = sdlgfx.c $(headers)
- gfx_la_LDFLAGS  = $(modflags)
--gfx_la_LIBADD   = SDL_gfx/libSDL_gfx.la \
--                  SDL_gfx/libimfi.la
-+gfx_la_LIBADD   = -lSDL_gfx
-+gfx_la_CPPFLAGS = -I/usr/include/SDL
- 
- SUFFIXES = .c
- 
- gx            = $(top_srcdir)/build-aux/guile-baux/gbaux-do
--snarfcppopts  = $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
-+snarfcppopts  = $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -I/usr/include/SDL
- 
- .c.x:
-       $(gx) c2x -o $@ $< -- $(snarfcppopts)
---- guile-sdl-0.5.0/configure.ac.orig  2013-07-24 17:25:26.483237676 +0200
-+++ guile-sdl-0.5.0/configure.ac       2013-07-24 17:27:34.633232297 +0200
-@@ -128,7 +128,6 @@
- AC_CONFIG_FILES([
-   Makefile
-   src/Makefile
--  src/SDL_gfx/Makefile
-   src/k/Makefile
-   doc/Makefile
-   test/Makefile

diff --git a/guile-sdl.spec b/guile-sdl.spec
index 1c41f4a13cc5357b782948d3be7b41ec708ebde1..31e9be1b4c7a887c956117bd6126e0727e053dd2 100644 (file)
--- a/guile-sdl.spec
+++ b/guile-sdl.spec
@@ -1,15 +1,14 @@
 Summary:       Guile-SDL - set of modules that provide Guile bindings for SDL
 Summary(pl.UTF-8):     Guile-SDL - zestaw modułów zapewniających wiązania Guile do SDL
 Name:          guile-sdl
-Version:       0.5.2
-Release:       2
+Version:       0.5.3
+Release:       1
 License:       LGPL v3+
 Group:         Libraries
-Source0:       http://ftp.gnu.org/gnu/guile-sdl/%{name}-%{version}.tar.xz
-# Source0-md5: 554c9524fbb1279111716576c65baf14
+Source0:       https://ftp.gnu.org/gnu/guile-sdl/%{name}-%{version}.tar.lz
+# Source0-md5: 0d0a85c0170c6169586ac98d3558b6a3
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-system-sdlgfx.patch
-Patch2:                %{name}-somode.patch
+Patch1:                %{name}-somode.patch
 URL:           http://www.gnu.org/software/guile-sdl/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: SDL_gfx-devel >= 2.0.22
@@ -20,9 +19,9 @@ BuildRequires:        autoconf >= 2.50
 BuildRequires: automake >= 1:1.12.2
 BuildRequires: guile-devel >= 5:1.4
 BuildRequires: libtool >= 2:2.4.2
+BuildRequires: lzip
 BuildRequires: texinfo
 BuildRequires: tar >= 1:1.22
-BuildRequires: xz
 Requires(post,postun): /sbin/ldconfig
 Requires:      SDL >= 1.2.0
 Requires:      SDL_gfx >= 2.0.22
@@ -58,10 +57,6 @@ SDL_mixer. Dołączone są także wiązania do biblioteki SDL_gfx.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-
-# ensure system SDL_gfx is used
-%{__rm} -r src/SDL_gfx
 
 %build
 %{__libtoolize}
@@ -69,7 +64,9 @@ SDL_mixer. Dołączone są także wiązania do biblioteki SDL_gfx.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --disable-embedded-gfx
+
 # build is racy (generating some files vs compilation)
 %{__make} -j1
 
@@ -92,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HISTORY NEWS README THANKS
+%doc AUTHORS ChangeLog HISTORY NEWS README THANKS ugh/*.sed
 %dir %{_libdir}/guile-sdl
 %attr(755,root,root) %{_libdir}/guile-sdl/gfx.so
 %attr(755,root,root) %{_libdir}/guile-sdl/mixer.so
@@ -106,6 +103,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/guile/site/sdl/simple.scm
 %{_datadir}/guile/site/sdl/ttf
 %{_infodir}/guile-sdl.info*
-# -devel (scripts to update for guile-sdl 0.5 API)
-%dir %{_datadir}/guile-sdl
-%{_datadir}/guile-sdl/0.5