- added link patch (so that as-needed in LDFLAGS actually works)

- drop .la file
- release 4 (rebuild without tslib in direct dependencies)

diff --git a/SDL_mixer-link.patch b/SDL_mixer-link.patch
new file mode 100644 (file)
index 0000000..f2f302c
--- /dev/null
+++ b/SDL_mixer-link.patch
@@ -0,0 +1,19 @@
+--- SDL_mixer-1.2.12/Makefile.in.orig  2012-01-15 23:01:04.000000000 +0100
++++ SDL_mixer-1.2.12/Makefile.in       2017-12-17 14:57:47.886631222 +0100
+@@ -63,13 +63,13 @@
+ .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
+ 
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ 
+ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ 
+ install: all install-hdrs install-lib #install-bin
+ install-hdrs:

diff --git a/SDL_mixer.spec b/SDL_mixer.spec
index 98984a875b5a168f6650deada727e6927530f59b..bc70399b7cb1d8f76cea0499c77aefa855825a46 100644 (file)
--- a/SDL_mixer.spec
+++ b/SDL_mixer.spec
@@ -14,13 +14,14 @@ Summary(pl.UTF-8):  Simple DirectMedia Layer - biblioteka miksująca próbki dźw
 Summary(pt_BR.UTF-8):  SDL - Biblioteca para mixagem
 Name:          SDL_mixer
 Version:       1.2.12
-Release:       3
+Release:       4
 License:       Zlib-like
 Group:         Libraries
 Source0:       http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.gz
 # Source0-md5: e03ff73d77a55e3572ad0217131dc4a1
 Patch0:                %{name}-timidity_cfg.patch
 Patch1:                %{name}-acfix.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.libsdl.org/projects/SDL_mixer/release-1.2.html
 BuildRequires: SDL-devel >= 1.2.10
 BuildRequires: autoconf
@@ -93,6 +94,7 @@ Bibliotecas estáticas para desenvolvimento com SDL_mixer.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install install-bin \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libSDL_mixer.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,7 +130,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libSDL_mixer.so
-%{_libdir}/libSDL_mixer.la
 %{_includedir}/SDL/SDL_mixer.h
 %{_pkgconfigdir}/SDL_mixer.pc