- up to 0.99.80-rc2

- gtk1 interface is gone

Changed files:
    alsaplayer.spec -> 1.95

diff --git a/alsaplayer.spec b/alsaplayer.spec
index 6a8798bad42a404bebcc8f93f2bb149aebbfbaa6..cd5a5920da06c020dae4aa0d8d263fe31ef4ed44 100644 (file)
--- a/alsaplayer.spec
+++ b/alsaplayer.spec
@@ -9,17 +9,17 @@
 Summary:       Alsaplayer - CD/FLAC/MOD/MP3/Ogg/WAV player
 Summary(pl.UTF-8):     Alsaplayer - odtwarzacz CD/FLAC/MOD/MP3/Ogg/WAV
 Name:          alsaplayer
 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.77
-Release:       1
-License:       GPL
+Version:       0.99.80
+%define        pre     rc2
+Release:       0.%{pre}.1
+License:       GPLv3

 Group:         Applications/Sound
 Group:         Applications/Sound

-Source0:       http://www.alsaplayer.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 3280795b199ae1bb245559ccbbca5c02
+Source0:       http://www.alsaplayer.org/%{name}-%{version}-%{pre}.tar.bz2
+# Source0-md5: bc8325c704f6cad167236055e1ff3ebb

 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-docs.patch
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-docs.patch

-Patch1:                %{name}-gcc33.patch
-Patch2:                %{name}-flac.patch
+Patch1:                %{name}-flac.patch

 URL:           http://www.alsaplayer.org/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
 URL:           http://www.alsaplayer.org/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel


@@ -28,7 +28,6 @@ BuildRequires:        autoconf
 BuildRequires: automake
 %{?with_esound:BuildRequires:  esound-devel >= 0.2.4}
 %{?with_flac:BuildRequires:    flac-devel >= 1.1.3}
 BuildRequires: automake
 %{?with_esound:BuildRequires:  esound-devel >= 0.2.4}
 %{?with_flac:BuildRequires:    flac-devel >= 1.1.3}

-BuildRequires: gtk+-devel

 BuildRequires: gtk+2-devel >= 1:2.0.3
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel >= 0.69.1}
 %{?with_flac:BuildRequires:    libid3tag-devel}
 BuildRequires: gtk+2-devel >= 1:2.0.3
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel >= 0.69.1}
 %{?with_flac:BuildRequires:    libid3tag-devel}


@@ -230,19 +229,6 @@ Alsaplayer plugin for playing Ogg/Vorbis files.
 %description input-vorbis -l pl.UTF-8
 Wtyczka alsaplayera do odtwarzania plików Ogg/Vorbis.
 
 %description input-vorbis -l pl.UTF-8
 Wtyczka alsaplayera do odtwarzania plików Ogg/Vorbis.
 

-%package interface-gtk
-Summary:       GTK+ interface for Alsaplayer
-Summary(pl.UTF-8):     Interfejs GTK+ alsaplayera
-Group:         X11/Applications/Sound
-Requires:      %{name} = %{version}-%{release}
-Provides:      alsaplayer_ui
-
-%description interface-gtk
-GTK+ interface for Alsaplayer.
-
-%description interface-gtk -l pl.UTF-8
-Interfejs GTK+ alsaplayera.
-

 %package interface-gtk2
 Summary:       GTK+ 2 interface for Alsaplayer
 Summary(pl.UTF-8):     Interfejs GTK+ 2 alsaplayera
 %package interface-gtk2
 Summary:       GTK+ 2 interface for Alsaplayer
 Summary(pl.UTF-8):     Interfejs GTK+ 2 alsaplayera


@@ -336,29 +322,31 @@ Alsaplayer plugin for sound through JACK system.
 %description output-jack -l pl.UTF-8
 Wtyczka alsaplayera do odtwarzania dźwięku przez system JACK.
 
 %description output-jack -l pl.UTF-8
 Wtyczka alsaplayera do odtwarzania dźwięku przez system JACK.
 

-%package scopes-gtk
+%package scopes2-gtk

 Summary:       Alsaplayer plugins for visualization
 Summary(pl.UTF-8):     Wtyczki alsaplayera do wizualizacji
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Summary:       Alsaplayer plugins for visualization
 Summary(pl.UTF-8):     Wtyczki alsaplayera do wizualizacji
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}

+Obsoletes:     alsaplayer-scopes-gtk

 
 

-%description scopes-gtk
+%description scopes2-gtk

 Alsaplayer plugins for visualization.
 
 Alsaplayer plugins for visualization.
 

-%description scopes-gtk -l pl.UTF-8
+%description scopes2-gtk -l pl.UTF-8

 Wtyczki do alsaplayera do wizualizacji.
 
 Wtyczki do alsaplayera do wizualizacji.
 

-%package scopes-opengl
+%package scopes2-opengl

 Summary:       Alsaplayer plugin for visualization using OpenGL
 Summary(pl.UTF-8):     Wtyczka alsaplayera do wizualizacji z użyciem OpenGL
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      OpenGL
 Summary:       Alsaplayer plugin for visualization using OpenGL
 Summary(pl.UTF-8):     Wtyczka alsaplayera do wizualizacji z użyciem OpenGL
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      OpenGL

+Obsoletes:     alsaplayer-scopes-opengl

 
 

-%description scopes-opengl
+%description scopes2-opengl

 Alsaplayer plugin for visualization using OpenGL.
 
 Alsaplayer plugin for visualization using OpenGL.
 

-%description scopes-opengl -l pl.UTF-8
+%description scopes2-opengl -l pl.UTF-8

 Wtyczka do alsaplayera do wizualizacji z użyciem OpenGL.
 
 %package devel
 Wtyczka do alsaplayera do wizualizacji z użyciem OpenGL.
 
 %package devel


@@ -386,10 +374,9 @@ Alsaplayer static library.
 Biblioteka statyczna Alsaplayera.
 
 %prep
 Biblioteka statyczna Alsaplayera.
 
 %prep

-%setup -q
+%setup -q -n %{name}-%{version}-%{pre}

 %patch0 -p1
 %patch0 -p1

-%patch1 -p1
-%patch2 -p1
+#patch1 -p1

 
 %build
 rm -f missing
 
 %build
 rm -f missing


@@ -403,13 +390,14 @@ export CPPFLAGS LDFLAGS
 %configure \
        %{?with_esound:--en}%{!?with_esound:--dis}able-esd \
        %{?with_flac:--en}%{!?with_flac:--dis}able-flac \
 %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 \
        %{?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-gtk \
+       --enable-gtk2 \

        --enable-oggflac \
        --enable-oggvorbis \
        --enable-opengl \
        --enable-oggflac \
        --enable-oggvorbis \
        --enable-opengl \


@@ -433,7 +421,9 @@ 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}/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}/scopes/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_pkglibdir}/scopes2/*.{a,la}
+
+%{find_lang} %{name}

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -448,7 +438,7 @@ echo
 
 %postun -p /sbin/ldconfig
 
 
 %postun -p /sbin/ldconfig
 

-%files
+%files -f %{name}.lang

 %defattr(644,root,root,755)
 %doc AUTHORS README ChangeLog
 %attr(755,root,root) %{_bindir}/alsaplayer
 %defattr(644,root,root,755)
 %doc AUTHORS README ChangeLog
 %attr(755,root,root) %{_bindir}/alsaplayer


@@ -458,7 +448,7 @@ echo
 %dir %{_pkglibdir}/interface
 %dir %{_pkglibdir}/output
 %dir %{_pkglibdir}/reader
 %dir %{_pkglibdir}/interface
 %dir %{_pkglibdir}/output
 %dir %{_pkglibdir}/reader

-%dir %{_pkglibdir}/scopes
+%dir %{_pkglibdir}/scopes2

 %attr(755,root,root) %{_pkglibdir}/input/libcdda.so
 %attr(755,root,root) %{_pkglibdir}/input/libwav.so
 %attr(755,root,root) %{_pkglibdir}/output/liboss_out.so
 %attr(755,root,root) %{_pkglibdir}/input/libcdda.so
 %attr(755,root,root) %{_pkglibdir}/input/libwav.so
 %attr(755,root,root) %{_pkglibdir}/output/liboss_out.so


@@ -473,10 +463,6 @@ echo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pkglibdir}/interface/libdaemon_interface.so
 
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pkglibdir}/interface/libdaemon_interface.so
 

-%files interface-gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_pkglibdir}/interface/libgtk_interface.so
-

 %files interface-gtk2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pkglibdir}/interface/libgtk2_interface.so
 %files interface-gtk2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pkglibdir}/interface/libgtk2_interface.so


@@ -539,18 +525,18 @@ echo
 %attr(755,root,root) %{_pkglibdir}/output/libnas_out.so
 %endif
 
 %attr(755,root,root) %{_pkglibdir}/output/libnas_out.so
 %endif
 

-%files scopes-gtk
+%files scopes2-gtk

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_pkglibdir}/scopes/libblurscope.so
-%attr(755,root,root) %{_pkglibdir}/scopes/liblevelmeter.so
-%attr(755,root,root) %{_pkglibdir}/scopes/liblogbarfft.so
-%attr(755,root,root) %{_pkglibdir}/scopes/libmonoscope.so
-%attr(755,root,root) %{_pkglibdir}/scopes/libspacescope.so
-%attr(755,root,root) %{_pkglibdir}/scopes/libsynaescope.so
-
-%files scopes-opengl
+%attr(755,root,root) %{_pkglibdir}/scopes2/libblurscope.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/liblevelmeter.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/liblogbarfft.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/libmonoscope.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/libspacescope.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/libsynaescope.so
+
+%files scopes2-opengl

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_pkglibdir}/scopes/liboglspectrum.so
+%attr(755,root,root) %{_pkglibdir}/scopes2/liboglspectrum.so

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)