X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aumix.spec;h=81986f2fea15a826bb35f9ce0237436b60b94542;hb=5e0e217c05fb6ee10f10fd34f1d8e5e3e054c5eb;hp=ac272c6a4ee3ac3321a05e36e5b0039bfd63e237;hpb=1bdb360196630c5cf81442ffd1ac41595ea9236a;p=packages%2Faumix.git

diff --git a/aumix.spec b/aumix.spec
index ac272c6..81986f2 100644
--- a/aumix.spec
+++ b/aumix.spec
@@ -9,12 +9,12 @@ Summary(pt_BR):	Mixador de 
 Summary(ru):	áÕÄÉÏ ÍÉËÛÅÒ ÎÁ ÂÁÚÅ ÂÉÂÌÉÏÔÅËÉ curses
 Summary(uk):	áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:		aumix
-Version:	2.7
-Release:	13
+Version:	2.8
+Release:	3
 License:	GPL
 Group:		Applications/Sound
-Source0:	http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
-# Source0-md5: 84ecc331bf6d86d3ac925590fee83af7
+Source0:	http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.bz2
+# Source0-md5:	dc3fc7209752207c23e7c94ab886b340
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.desktop
@@ -31,7 +31,6 @@ 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,22 @@ 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
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	aumix-OSS-preserve-settings
 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.
@@ -110,8 +110,6 @@ systemu.
 %patch2 -p1
 
 %build
-#rm -f missing acinclude.m4
-rm -f missing
 #%%{__gettextize}
 %{__aclocal}
 %{__autoconf}
@@ -119,13 +117,14 @@ rm -f missing
 
 CPPFLAGS="-I/usr/include/ncurses"
 %configure \
-	--without-gtk
+	--without-gtk \
+	--without-gtk1
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
@@ -134,7 +133,7 @@ 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
 
@@ -145,7 +144,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/aumix/aumix.xpm
 %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"
@@ -153,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
@@ -169,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