X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=alsaplayer.spec;h=d69c7d29d1f910160d0aba089ddf99551a81013b;hb=HEAD;hp=3ce36748d5556a572f5ae6c4b353317c513a5513;hpb=00f7abc576af26f96728b28e40eab5c704c6c341;p=packages%2Falsaplayer.git

diff --git a/alsaplayer.spec b/alsaplayer.spec
index 3ce3674..d69c7d2 100644
--- a/alsaplayer.spec
+++ b/alsaplayer.spec
@@ -9,29 +9,29 @@
 Summary:	Alsaplayer - CD/FLAC/MOD/MP3/Ogg/WAV player
 Summary(pl.UTF-8):	Alsaplayer - odtwarzacz CD/FLAC/MOD/MP3/Ogg/WAV
 Name:		alsaplayer
-Version:	0.99.80
+Version:	0.99.81
 Release:	3
 License:	GPL v3+
 Group:		Applications/Sound
 Source0:	http://www.alsaplayer.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	04f8c2321a37d15f40f9ee21251c6202
+# Source0-md5:	845c53975791ba342e316ceac8aa1527
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-docs.patch
-Patch1:		%{name}-g++.patch
 URL:		http://www.alsaplayer.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	alsa-lib-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	autoconf
+BuildRequires:	audiofile-devel >= 0.1.7
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_esound:BuildRequires:	esound-devel >= 0.2.4}
 %{?with_flac:BuildRequires:	flac-c++-devel >= 1.2.0}
-BuildRequires:	gtk+2-devel >= 1:2.0.3
+BuildRequires:	glib2-devel >= 2.0.3
+BuildRequires:	gtk+2-devel >= 2:2.10.0
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel >= 0.69.1}
 %{?with_flac:BuildRequires:	libid3tag-devel}
 BuildRequires:	libmad-devel
-%{?with_mikmod:BuildRequires:	libmikmod-devel}
+%{?with_mikmod:BuildRequires:	libmikmod-devel >= 3.1.7}
 BuildRequires:	libsndfile-devel >= 1.0.4
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
@@ -160,6 +160,7 @@ Summary:	Alsaplayer plugin for playing WAVE audio formats using audiofile
 Summary(pl.UTF-8):	Wtyczka alsaplayera do odtwarzania plików audio typu WAVE przy użyciu audiofile
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	audiofile >= 0.1.7
 
 %description input-audiofile
 Alsaplayer plugin for playing WAVE audio formats (like AIFF, AIFC,
@@ -198,6 +199,7 @@ Summary:	Alsaplayer plugin for playing mod files
 Summary(pl.UTF-8):	Wtyczka alsaplayera do odtwarzania plików mod
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	libmikmod >= 3.1.7
 
 %description input-mikmod
 Alsaplayer plugin for playing mod files.
@@ -210,6 +212,7 @@ Summary:	Alsaplayer plugin for playing WAVE audio formats using libsndfile
 Summary(pl.UTF-8):	Wtyczka alsaplayera do odtwarzania plików audio typu WAVE przy użyciu libsndfile
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	libsndfile >= 1.0.4
 
 %description input-sndfile
 Alsaplayer plugin for playing WAVE audio formats (like AIFF, AIFC,
@@ -236,6 +239,7 @@ Summary:	GTK+ 2 interface for Alsaplayer
 Summary(pl.UTF-8):	Interfejs GTK+ 2 alsaplayera
 Group:		X11/Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	gtk+2 >= 2:2.10.0
 Provides:	alsaplayer_ui
 Obsoletes:	alsaplayer-interface-gtk
 
@@ -289,6 +293,7 @@ Summary:	Alsaplayer plugin for playing through esound daemon
 Summary(pl.UTF-8):	Wtyczka alsaplayera do odtwarzania przez demona esound
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	esound-libs >= 0.2.4
 Provides:	alsaplayer_output
 
 %description output-esound
@@ -317,6 +322,7 @@ Summary:	Alsaplayer plugin for playing sound through JACK
 Summary(pl.UTF-8):	Wtyczka alsaplayera do odtwarzania dźwięku przez JACK-a
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	jack-audio-connection-kit-libs >= 0.69.1
 Provides:	alsaplayer_output
 
 %description output-jack
@@ -379,29 +385,23 @@ Biblioteka statyczna Alsaplayera.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-CPPFLAGS=" -I/usr/X11R6/include"
-LDFLAGS="%{rpmldflags} -L/usr/X11R6/lib"
-export CPPFLAGS LDFLAGS
 %configure \
-	%{?with_esound:--en}%{!?with_esound:--dis}able-esd \
-	%{?with_flac:--en}%{!?with_flac:--dis}able-flac \
-	%{?with_flac:--en}%{!?with_flac:--dis}able-oggflac \
-	%{?with_jack:--en}%{!?with_jack:--dis}able-jack \
-	%{?with_mikmod:--en}%{!?with_mikmod:--dis}able-mikmod \
-	%{?with_nas:--en}%{!?with_nas:--dis}able-nas \
-	%{?with_esound:--en}%{!?with_esound:--dis}able-esd \
 	--enable-alsa \
 	--enable-audiofile \
+	--enable-esd%{!?with_esound:=no} \
+	--enable-flac%{!?with_flac:=no} \
 	--enable-gtk2 \
-	--enable-oggflac \
+	--enable-jack%{!?with_jack:=no} \
+	--enable-mikmod%{!?with_mikmod:=no} \
+	--enable-nas%{!?with_nas:=no} \
+	--enable-oggflac%{!?with_flac:=no} \
 	--enable-oggvorbis \
 	--enable-opengl \
 	--enable-oss \
@@ -414,17 +414,16 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pkgconfigdir=%{_pkgconfigdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-rm -f $RPM_BUILD_ROOT%{_pkglibdir}/input/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_pkglibdir}/interface/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_pkglibdir}/output/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_pkglibdir}/reader/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_pkglibdir}/scopes2/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_pkglibdir}/input/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_pkglibdir}/interface/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_pkglibdir}/output/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_pkglibdir}/reader/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_pkglibdir}/scopes2/*.{a,la}
 
 %find_lang %{name}