- added .desktop

- cleanups

Changed files:
    alsaplayer.spec -> 1.69

diff --git a/alsaplayer.spec b/alsaplayer.spec
index 0ba370d244a6bed9f404a63c3e643ff6e72a3b1b..28603dac02dea9cbb49edecdaf75e2729ea43426 100644 (file)
--- a/alsaplayer.spec
+++ b/alsaplayer.spec
@@ -1,16 +1,16 @@
 # TODO:
 # - check descriptions
 # - add/check translations
 # TODO:
 # - check descriptions
 # - add/check translations

-# - add .desktop file
-Summary:       Alsaplayer - MP2/MP3/WAV/CD player
-Summary(pl):   Alsaplayer - odtwarzacz MP2/MP3/WAV/CD
+Summary:       Alsaplayer - CD/FLAC/MOD/MP3/OGG/WAV player
+Summary(pl):   Alsaplayer - odtwarzacz CD/FLAC/MOD/MP3/OGG/WAV

 Name:          alsaplayer
 Version:       0.99.75
 Name:          alsaplayer
 Version:       0.99.75

-Release:       0.3
+Release:       0.4

 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       ftp://ftp.alsa-project.org/pub/people/andy/%{name}-%{version}.tar.bz2
 # Source0-md5: 353b57058e05aa5f0c01f93fc049c650
 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       ftp://ftp.alsa-project.org/pub/people/andy/%{name}-%{version}.tar.bz2
 # Source0-md5: 353b57058e05aa5f0c01f93fc049c650

+Source1:       %{name}.desktop

 Patch0:                %{name}-docs.patch
 Patch1:                %{name}-gcc33.patch
 URL:           http://www.alsaplayer.org/
 Patch0:                %{name}-docs.patch
 Patch1:                %{name}-gcc33.patch
 URL:           http://www.alsaplayer.org/


@@ -131,6 +131,18 @@ Og
  - programowa kontrola g³o¶no¶ci i balansu
  - synchronizacja d¼wiêku i wska¼ników przy u¿yciu mo¿liwo¶ci ALSA
 
  - programowa kontrola g³o¶no¶ci i balansu
  - synchronizacja d¼wiêku i wska¼ników przy u¿yciu mo¿liwo¶ci ALSA
 

+%package daemon
+Summary:       Deamon interface for Alsaplayer
+Summary(pl):   Interfejs demona alsaplayera
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}
+
+%description daemon
+Deamon interface for Alsaplayer.
+
+%description daemon -l pl
+Interfejs demona alsaplayera.
+

 %package input-audiofile
 Summary:       Alsaplayer plugin for playing wave audio formats
 Summary(pl):   Wtyczka do alsaplayera do odtwarzania plików audio typu wave
 %package input-audiofile
 Summary:       Alsaplayer plugin for playing wave audio formats
 Summary(pl):   Wtyczka do alsaplayera do odtwarzania plików audio typu wave


@@ -157,17 +169,6 @@ Alsaplayer plugin for playing FLAC files.
 %description input-flac -l pl
 Wtyczka do alsaplayera do odtwarzania plików FLAC.
 
 %description input-flac -l pl
 Wtyczka do alsaplayera do odtwarzania plików FLAC.
 

-%package output-jack
-Summary:        Alsaplayer plugin for playing sound through JACK
-Summary(pl):    Wtyczka do alsaplayera do odtwarzania d¼wiêku przez JACK
-Group:          X11/Applications/Sound
-Requires:       %{name} = %{version}
-
-%description output-jack
-Alsaplayer plugin for sound through JACK
-
-%description output-jack -l pl
-Wtyczka do alsaplayera do odtwarzania d¼wiêku przez JACK

 
 %package input-mad
 Summary:       Alsaplayer plugin for playing MP3 files using MAD
 
 %package input-mad
 Summary:       Alsaplayer plugin for playing MP3 files using MAD


@@ -219,6 +220,41 @@ Alsaplayer plugin for playing ogg/vorbis files.
 %description input-vorbis -l pl
 Wtyczka do alsaplayera do odtwarzania plików ogg/vorbis.
 
 %description input-vorbis -l pl
 Wtyczka do alsaplayera do odtwarzania plików ogg/vorbis.
 

+%package interface-gtk
+Summary:       GTK+ interface for Alsaplayer
+Summary(pl):   Interfejs GTK+ alsaplayera
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}
+
+%description interface-gtk
+GTK+ interface for Alsaplayer.
+
+%description interface-gtk -l pl
+Interfejs GTK+ alsaplayera.
+
+%package interface-text
+Summary:       Text interface for Alsaplayer
+Summary(pl):   Interfejs tekstowy alsaplayera
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}
+
+%description interface-text
+Text interface for Alsaplayer.
+
+%description interface-text -l pl
+Interfejs tekstowy alsaplayera.
+
+%package interface-xosd
+Summary:       xosd interface for Alsaplayer
+Summary(pl):   Interfejs xosd alsaplayera
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}
+
+%description interface-xosd
+xosd interface for Alsaplayer.
+
+%description interface-xosd -l pl
+Interfejs xosd alsaplayera.

 
 %package output-alsa
 Summary:       Alsaplayer plugin for playing through alsa drivers
 
 %package output-alsa
 Summary:       Alsaplayer plugin for playing through alsa drivers


@@ -250,6 +286,18 @@ Summary(pl):       Wtyczka do alsaplayera do odtwarzania przez demona NAS
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}
 
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}
 

+%package output-jack
+Summary:        Alsaplayer plugin for playing sound through JACK
+Summary(pl):    Wtyczka do alsaplayera do odtwarzania d¼wiêku przez JACK
+Group:          X11/Applications/Sound
+Requires:       %{name} = %{version}
+
+%description output-jack
+Alsaplayer plugin for sound through JACK
+
+%description output-jack -l pl
+Wtyczka do alsaplayera do odtwarzania d¼wiêku przez JACK
+

 %description output-nas
 Alsaplayer plugin for playing sound through NAS (network audio system)
 daemon.
 %description output-nas
 Alsaplayer plugin for playing sound through NAS (network audio system)
 daemon.


@@ -283,54 +331,6 @@ Alsaplayer plugin for visualization using OpenGL.
 %description scopes-opengl -l pl
 Wtyczka do alsaplayera do wizualizacji z u¿yciem OpenGL.
 
 %description scopes-opengl -l pl
 Wtyczka do alsaplayera do wizualizacji z u¿yciem OpenGL.
 

-%package interface-daemon
-Summary:       Deamon interface for Alsaplayer
-Summary(pl):   Interfejs demona alsaplayera
-Group:         X11/Applications/Sound
-Requires:      %{name} = %{version}
-
-%description daemon
-Deamon interface for Alsaplayer.
-
-%description daemon -l pl
-Interfejs demona alsaplayera.
-
-%package interface-gtk
-Summary:       GTK+ interface for Alsaplayer
-Summary(pl):   Interfejs GTK+ alsaplayera
-Group:         X11/Applications/Sound
-Requires:      %{name} = %{version}
-
-%description interface-gtk
-GTK+ interface for Alsaplayer.
-
-%description interface-gtk -l pl
-Interfejs GTK+ alsaplayera.
-
-%package interface-text
-Summary:       Text interface for Alsaplayer
-Summary(pl):   Interfejs tekstowy alsaplayera
-Group:         X11/Applications/Sound
-Requires:      %{name} = %{version}
-
-%description interface-text
-Text interface for Alsaplayer.
-
-%description interface-text -l pl
-Interfejs tekstowy alsaplayera.
-
-%package interface-xosd
-Summary:       xosd interface for Alsaplayer
-Summary(pl):   Interfejs xosd alsaplayera
-Group:         X11/Applications/Sound
-Requires:      %{name} = %{version}
-
-%description interface-xosd
-xosd interface for Alsaplayer.
-
-%description interface-xosd -l pl
-Interfejs xosd alsaplayera.
-

 %package devel
 Summary:       Alsaplayer header files
 Summary(pl):   Pliki nag³ówkowe Alsaplayera
 %package devel
 Summary:       Alsaplayer header files
 Summary(pl):   Pliki nag³ówkowe Alsaplayera


@@ -391,11 +391,14 @@ export CPPFLAGS LDFLAGS
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

+install -d $RPM_BUILD_ROOT%{_desktopdir}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
 

+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+

 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}/input/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_pkglibdir}/interface/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_pkglibdir}/output/*.{a,la}


@@ -426,6 +429,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pkglibdir}/reader/libfile.so
 %attr(755,root,root) %{_pkglibdir}/reader/libhttp.so
 %{_mandir}/man*/*
 %attr(755,root,root) %{_pkglibdir}/reader/libfile.so
 %attr(755,root,root) %{_pkglibdir}/reader/libhttp.so
 %{_mandir}/man*/*

+%{_desktopdir}/%{name}.desktop

 
 %ifarch sparc
 %attr(755,root,root) %{_pkglibdir}/output/libsparc_out.so
 
 %ifarch sparc
 %attr(755,root,root) %{_pkglibdir}/output/libsparc_out.so