Automatic import for version 1.2.12

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  "SDL_mixer-1.2.11.tar.gz": ef5d45160babeb51eafa7e4019cec38324ee1a5d
+  "SDL_mixer-1.2.12.tar.gz": a20fa96470ad9e1052f1957b77ffa68fb090b384

SDL_mixer-1.2.11-music-crash-fix.patch

@@ -1,14 +0,0 @@
---- music.c	2011-08-21 17:12:52.000000000 +0200
-+++ music.c.2	2011-08-21 17:13:02.000000000 +0200
-@@ -1076,6 +1076,11 @@
- static int music_internal_playing()
- {
- 	int playing = 1;
-+
-+	if (music_playing == NULL) {
-+		return 0;
-+	}
-+
- 	switch (music_playing->type) {
- #ifdef CMD_MUSIC
- 	    case MUS_CMD:

SDL_mixer.spec

@@ -1,28 +1,25 @@
-%define	major 0
+%define		major 0
-%define apiver 1.2
+%define		apiver 1.2
-%define	libname %mklibname %{name} %{apiver} %{major}
+%define		libname %mklibname %{name} %{apiver} %{major}
-%define develname %mklibname %{name} -d
+%define		develname %mklibname %{name} -d
-%define version 1.2.11
 
-Summary:	Simple DirectMedia Layer - mixer
 Name:		SDL_mixer
-Version:	%{version}
+Version:	1.2.12
-Release:	%mkrel 8
+Release:	%mkrel 1
+Summary:	Simple DirectMedia Layer - mixer
 License:	LGPLv2+
 Group:		System/Libraries
 URL:		http://www.libsdl.org/projects/SDL_mixer/
 Source0:	http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.gz
-Patch0:		SDL_mixer-1.2.11-music-crash-fix.patch
 BuildRequires:	SDL-devel >= 1.2.10
 BuildRequires:	esound-devel
 BuildRequires:	libmikmod-devel
 BuildRequires:	oggvorbis-devel
-BuildRequires:	libz-devel
+BuildRequires:	zlib-devel
 BuildRequires:	nas-devel
 BuildRequires:	smpeg-devel >= 0.4.3
 BuildRequires:	libflac-devel
 BuildRequires:	libstdc++-static-devel
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 
 %description
 SDL_mixer is a sample multi-channel audio mixer library. It supports any
@@ -64,9 +61,7 @@ Requires:	%{libname} = %{version}-%{release}
 This package contains binary to test the associated library.
 
 %prep
-
 %setup -q
-%patch0 -p0
 
 %build
 # (Anssi 02/2010) The below --disable-music-foo-shared options do not disable
@@ -79,47 +74,49 @@ This package contains binary to test the associated library.
 		--disable-music-ogg-shared \
 		--disable-music-flac-shared \
 		--disable-music-mod-shared \
-		--disable-music-mp3-shared
+		--disable-music-mp3-shared \
+		--disable-static
 %make
 
 iconv -f ISO-8859-1 -t UTF-8 CHANGES > CHANGES.tmp
 touch -r CHANGES CHANGES.tmp
-mv CHANGES.tmp CHANGES
+%__mv CHANGES.tmp CHANGES
 
 %install
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 %makeinstall_std install-bin
 
 %if "%{_lib}" == "lib64"
-perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la
+%__perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la
 %endif
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files -n %{name}-player
-%defattr(-, root, root)
 %doc README
 %{_bindir}/playwave
 %{_bindir}/playmus
 
 %files -n %{libname}
-%defattr(-,root,root)
-##%doc mikmod/AUTHORS mikmod/README
 %doc timidity/FAQ timidity/README
 %{_libdir}/lib*%{apiver}.so.%{major}*
 
 %files -n %{develname}
-%defattr(-,root,root)
 %doc README CHANGES
-%{_libdir}/*a
 %{_libdir}/lib*.so
 %{_includedir}/SDL/*
 %{_libdir}/pkgconfig/%{name}.pc
-
+%if %{mdvver} < 201200
+%{_libdir}/*a
+%endif
 
 %changelog
-* Wed Jan 04 2012 Andrey Bondrov <abondrov@mandriva.org> 1.2.11-8mdv2012.0
+* Mon Mar 19 2012 Andrey Bondrov <abondrov@mandriva.org> 1.2.12-1mdv2012.0
++ Revision: 785613
+- New version 1.2.12, don't build static lib, update file list
+
+* Wed Jan 04 2012 Andrey Bondrov <abondrov@mandriva.org> 1.2.11-8
 + Revision: 753220
 - Rebuild for .la files issue