LOG New version 1.2.12 (sync with Cooker), convert BR to pkgconfig style, drop Obsoletes

.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.spec

@@ -1,27 +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 6
+Release:	2
+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
-BuildRequires:	SDL-devel >= 1.2.10
+BuildRequires:	pkgconfig(sdl)
-BuildRequires:	esound-devel
+BuildRequires:	pkgconfig(esound)
 BuildRequires:	libmikmod-devel
-BuildRequires:	oggvorbis-devel
+BuildRequires:	pkgconfig(vorbis)
-BuildRequires:	libz-devel
+BuildRequires:	zlib-devel
 BuildRequires:	nas-devel
 BuildRequires:	smpeg-devel >= 0.4.3
-BuildRequires:	libflac-devel
+BuildRequires:	pkgconfig(flac)
 BuildRequires:	libstdc++-static-devel
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 
 %description
 SDL_mixer is a sample multi-channel audio mixer library. It supports any
@@ -43,11 +41,10 @@ linked with %{name}.
 Summary:	Headers for developing programs that will use %{name}
 Group:		Development/C
 Requires:	%{libname} = %{version}-%{release}
-Requires:	SDL-devel
+Requires:	pkgconfig(sdl)
 Provides:	%{name}-devel = %{version}-%{release}
 Provides:	lib%{name}-devel = %{version}-%{release}
 Provides:	%{name}%{apiver}-devel = %{version}-%{release}
-Obsoletes:	%{_lib}SDL_mixer1.2-devel < 1.2.10
 
 %description -n %{develname}
 This package contains the headers that programmers will need to develop
@@ -56,7 +53,6 @@ applications which will use %{name}.
 %package -n %{name}-player
 Summary:	Players using %{name}
 Group:		System/Libraries
-Obsoletes:	%{_lib}SDL_mixer-test < 1.2.10
 Requires:	%{libname} = %{version}-%{release}
 
 %description -n %{name}-player
@@ -76,55 +72,46 @@ 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}
 %makeinstall_std install-bin
 
-%if "%{_lib}" == "lib64"
-perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la
-%endif
-
-%if %mdkversion < 200900
-%post -n %{libname} -p /sbin/ldconfig
-%endif
-
-%if %mdkversion < 200900
-%postun -n %{libname} -p /sbin/ldconfig
-%endif
-
-%clean
-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
 
-
 %changelog
-* Mon Jun 20 2011 Oden Eriksson <oeriksson@mandriva.com> 1.2.11-6mdv2011.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
+
+* Sun Aug 21 2011 Tomas Kindl <supp@mandriva.org> 1.2.11-7
++ Revision: 696013
+- add patch that MAY help to fix #58059
+
+* Mon Jun 20 2011 Oden Eriksson <oeriksson@mandriva.com> 1.2.11-6
 + Revision: 686304
 - avoid pulling 32 bit libraries on 64 bit arch
 
@@ -191,12 +178,12 @@ rm -rf %{buildroot}
 + Revision: 213219
 - BR libz
 
-* Mon Mar 10 2008 Olivier Blin <oblin@mandriva.com> 1.2.8-5mdv2008.1
+* Mon Mar 10 2008 Olivier Blin <blino@mandriva.org> 1.2.8-5mdv2008.1
 + Revision: 183454
 - remove pulseaudio-devel requirement in devel package
   (SDL is not dynamically linked with pulseaudio anymore)
 
-* Fri Mar 07 2008 Olivier Blin <oblin@mandriva.com> 1.2.8-4mdv2008.1
+* Fri Mar 07 2008 Olivier Blin <blino@mandriva.org> 1.2.8-4mdv2008.1
 + Revision: 181200
 - explicitely require pulseaudio-devel in devel package
   (find-requires does not parse .la files, #38653, breaks toppler build)
@@ -217,7 +204,7 @@ rm -rf %{buildroot}
 - spec file clean
 - correct libification
 
-  + Olivier Blin <oblin@mandriva.com>
+  + Olivier Blin <blino@mandriva.org>
     - restore BuildRoot
 
   + Thierry Vignaud <tv@mandriva.org>
@@ -273,7 +260,7 @@ rm -rf %{buildroot}
 - cosmetics
 
 * Wed Mar 23 2005 Giuseppe Ghibò <ghibo@mandrakesoft.com> 1.2.6-1mdk
-- Release: 1.2.8.
+- Release: 1.2.6.
 
 * Sat Nov 13 2004 Götz Waschk <waschk@linux-mandrake.com> 1.2.5-5mdk
 - rebuild