- release 15

[packages/aumix.git] / aumix.spec

diff --git a/aumix.spec b/aumix.spec
index 2c235393e89ebc15853d963817469fbd3b5d1a75..de828c81d42fcf0391518d0b94ed9bdc372ae07b 100644 (file)
--- a/aumix.spec
+++ b/aumix.spec
@@ -10,30 +10,27 @@ Summary(ru):        
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
 Version:       2.7
-Release:       10
+Release:       15
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
+# Source0-md5: 84ecc331bf6d86d3ac925590fee83af7
 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
-Conflicts:     aumix-gtk
-
-%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
@@ -91,8 +88,8 @@ 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
 
@@ -112,13 +109,14 @@ systemu.
 %patch2 -p1
 
 %build
-rm -f missing acinclude.m4
-%{__gettextize}
+#rm -f missing acinclude.m4
+rm -f missing
+#%%{__gettextize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 
-CPPFLAGS="-I%{_includedir}/ncurses" \
+CPPFLAGS="-I/usr/include/ncurses"
 %configure \
        --without-gtk
 
@@ -127,22 +125,19 @@ CPPFLAGS="-I%{_includedir}/ncurses" \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT{%{_xbindir},%{_xmandir}/man1} \
+       $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
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+rm -f $RPM_BUILD_ROOT%{_datadir}/aumix/aumix.xpm
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
-
-gzip -9nf AUTHORS BUGS ChangeLog NEWS README TODO
+:> $RPM_BUILD_ROOT%{_sysconfdir}/aumixrc
 
 %find_lang %{name}
 
@@ -167,17 +162,15 @@ 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
 
-%attr(755,root,root) %{_xbindir}/xaumix
-%{_xmandir}/man1/*
-%{_pixmapsdir}/*.xpm
-%{_applnkdir}/Multimedia/xaumix.desktop
+%{_pixmapsdir}/*.png
+%{_applnkdir}/Multimedia/aumix.desktop
 
 %files OSS-preserve-settings
 %defattr(644,root,root,755)