- s/OSS-preserve-settings/preserve-settings/ - this also works for ALSA

[packages/aumix.git] / aumix.spec

diff --git a/aumix.spec b/aumix.spec
index 1f1985dbdb534b00df225a3366a7b2a06a3328bb..2e9994aa46bb6ec10c109319c70015e300a7b380 100644 (file)
--- a/aumix.spec
+++ b/aumix.spec
@@ -10,7 +10,7 @@ Summary(ru):  
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
 Version:       2.7
-Release:       12
+Release:       15
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
@@ -25,13 +25,12 @@ Patch2:             %{name}-ac250.patch
 URL:           http://www.jpj.net/~trevor/aumix.html
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gpm-devel
 BuildRequires: gettext-devel
+BuildRequires: gpm-devel
 BuildRequires: ncurses-devel >= 5.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     aumix-gtk
 Obsoletes:     aumix-X11
-Conflicts:     aumix-gtk
 
 %description
 This program provides a tty-based, interactive method of controlling a
@@ -84,21 +83,21 @@ CD, 
 Ú×ÕËÏ×ϧ ËÁÒÔËÉ. ÷ÏÎÁ ÄÏÚ×ÏÌѤ ÚͦÎÀ×ÁÔÉ ÑË ×ȦÄΦ Ò¦×Φ ÓÉÇÎÁÌ¦× Ú
 CD, ͦËÒÏÆÏÎÕ, ÓÉÎÔÅÚÁÔÏÒ¦× ÎÁ Ú×ÕËÏ×¦Ê ÐÌÁÔ¦, ÔÁË ¦ ×ÉȦÄÎÉÊ Ò¦×ÅÎØ.
 
-%package OSS-preserve-settings
+%package preserve-settings
 Summary:       Saves/restores mixer settings on system shutdown/startup
 Summary(pl):   Zapisuje/odtwarza ustawienia przy zamkniêciu/starcie systemu
 Group:         Applications/Sound
 Requires:      %{name} = %{version}
-Prereq:                rc-scripts >= 0.2.0
-Prereq:                /sbin/chkconfig
+PreReq:                rc-scripts >= 0.2.0
+Requires(post,preun):  /sbin/chkconfig
 Obsoletes:     rhsound
 Conflicts:     alsa-utils
 
-%description OSS-preserve-settings
+%description preserve-settings
 This package contains script, which will save settings of sound card's
 mixer on system shutdown and restore them on system startup.
 
-%description OSS-preserve-settings -l pl
+%description preserve-settings -l pl
 Ten pakiet zawiera skrypt, który zapisuje ustawienia miksera karty
 d¼wiêkowej przy zamkniêciu systemu i odtwarza je po uruchomieniu
 systemu.
@@ -125,8 +124,8 @@ CPPFLAGS="-I/usr/include/ncurses"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
+       $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}} \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
@@ -134,17 +133,18 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/aumix
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/aumix
-install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+rm -f $RPM_BUILD_ROOT%{_datadir}/aumix/aumix.xpm
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
+:> $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post OSS-preserve-settings
+%post preserve-settings
 /sbin/chkconfig --add aumix
 if [ ! -f /var/lock/subsys/aumix ]; then
        echo "Run \"/etc/rc.d/init.d/aumix start\" to initialize saving/restoring"
@@ -152,7 +152,7 @@ if [ ! -f /var/lock/subsys/aumix ]; then
        echo "setup sound volume."
 fi
 
-%preun OSS-preserve-settings
+%preun preserve-settings
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/aumix ]; then
                /etc/rc.d/init.d/aumix stop
@@ -168,11 +168,10 @@ fi
 %attr(755,root,root) %{_bindir}/aumix
 %{_mandir}/man1/*
 %{_datadir}/aumix
-
 %{_pixmapsdir}/*.png
-%{_applnkdir}/Multimedia/aumix.desktop
+%{_desktopdir}/aumix.desktop
 
-%files OSS-preserve-settings
+%files preserve-settings
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/aumix
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/aumix