X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=aumix.spec;h=4efe35de26c5efaffd3ad7b09987736e04240066;hb=25d6dd350712a44ea47d960c705d78f0a3182ed4;hp=55fe5dba691fbd769c00ac81a19ba093769bed7d;hpb=ed373d303aa3904b1a6eea91dfd67dc7cfb16b01;p=packages%2Faumix.git

diff --git a/aumix.spec b/aumix.spec
index 55fe5db..4efe35d 100644
--- a/aumix.spec
+++ b/aumix.spec
@@ -9,31 +9,29 @@ Summary(pt_BR):	Mixador de 
 Summary(ru):	áÕÄÉÏ ÍÉËÛÅÒ ÎÁ ÂÁÚÅ ÂÉÂÌÉÏÔÅËÉ curses
 Summary(uk):	áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:		aumix
-Version:	2.7
-Release:	9
+Version:	2.8
+Release:	1
 License:	GPL
 Group:		Applications/Sound
-Source0:	http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
+Source0:	http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.bz2
+# Source0-md5:	dc3fc7209752207c23e7c94ab886b340
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Source3:	x%{name}.desktop
+Source3:	%{name}.desktop
+Source4:	%{name}.png
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-x%{name}.patch
 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
 
-%define		_xbindir	/usr/X11R6/bin
-%define		_xdatadir	/usr/X11R6/share
-%define		_xmandir	/usr/X11R6/man
-
 %description
 This program provides a tty-based, interactive method of controlling a
 sound card's mixer. It lets you adjust the input levels from the CD,
@@ -85,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
-Prereq:		/sbin/chkconfig
+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.
@@ -111,44 +110,41 @@ systemu.
 %patch2 -p1
 
 %build
-rm -f missing acinclude.m4
-gettextize --copy --force
-aclocal
+#%%{__gettextize}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 
-CPPFLAGS="-I%{_includedir}/ncurses" \
+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}} \
-	$RPM_BUILD_ROOT{%{_xbindir},%{_xmandir}/man1} \
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
-mv -f $RPM_BUILD_ROOT%{_bindir}/xaumix $RPM_BUILD_ROOT%{_xbindir}
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/xaumix* $RPM_BUILD_ROOT%{_xmandir}/man1
-mv -f $RPM_BUILD_ROOT%{_datadir}/aumix/*xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 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
-
-touch $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+rm -f $RPM_BUILD_ROOT%{_datadir}/aumix/aumix.xpm
 
-gzip -9nf AUTHORS BUGS ChangeLog NEWS README TODO
+:> $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"
@@ -156,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
@@ -166,19 +162,16 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc {AUTHORS,BUGS,ChangeLog,NEWS,README,TODO}.gz
+%doc AUTHORS BUGS ChangeLog NEWS README TODO
 %config(noreplace,missingok) %verify(not size mtime md5) %{_sysconfdir}/aumixrc
 
 %attr(755,root,root) %{_bindir}/aumix
 %{_mandir}/man1/*
 %{_datadir}/aumix
+%{_pixmapsdir}/*.png
+%{_desktopdir}/aumix.desktop
 
-%attr(755,root,root) %{_xbindir}/xaumix
-%{_xmandir}/man1/*
-%{_pixmapsdir}/*.xpm
-%{_applnkdir}/Multimedia/xaumix.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