- use rpm features (gzipping, %%debug, %%config), automake-related changes

- added sysconfig in OSS subpackage - save/init can be {dis,en}abled separately
- release 2

Changed files:
    aumix.init -> 1.3
    aumix.spec -> 1.62
    aumix.sysconfig -> 1.1

diff --git a/aumix.init b/aumix.init
index 590d21387896948098ab2f700bae9cdc1678dc1b..0b785d681e4752ec9164c73c1475c2d1bb205f63 100644 (file)
--- a/aumix.init
+++ b/aumix.init
@@ -10,6 +10,8 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+. /etc/sysconfig/aumix
+
 # See how we were called.
 case "$1" in
   start)
@@ -17,9 +19,13 @@ case "$1" in
        if [ ! -f /var/lock/subsys/aumix ]; then
                show "Setting up sound card mixer"
                busy
-               aumix -f /etc/aumixrc -L >/dev/null
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aumix
+               if [ "$AUMIX_AUTO_INIT" = "yes" ]; then
+                       aumix -f /etc/aumixrc -L >/dev/null
+                       RETVAL=$?
+                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aumix
+               else
+                       touch /var/lock/subsys/aumix
+               fi
                ok
        else
                nls "Sound card mixer is already set up"
@@ -30,7 +36,9 @@ case "$1" in
        if [ -f /var/lock/subsys/aumix ]; then
                show "Saving sound card mixer's settings"
                busy
-               aumix -f /etc/aumixrc -S
+               if [ "$AUMIX_AUTO_SAVE" = "yes" ]; then
+                       aumix -f /etc/aumixrc -S
+               fi
                rm -f /var/lock/subsys/aumix >/dev/null 2>&1
                ok
        else

diff --git a/aumix.spec b/aumix.spec
index 979c0c8704b403ad523b61de70617b9fbe5dc01a..8f422e62b88b9b5004ae49d4997ac230af5044d0 100644 (file)
--- a/aumix.spec
+++ b/aumix.spec
@@ -8,16 +8,19 @@ Summary(ru):  
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
 Version:       2.7
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Sound
+Group(de):     Applikationen/Laut
 Group(pl):     Aplikacje/D¼wiêk
 Source0:       http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.gz
-Source1:       aumix.init
-Source2:       xaumix.desktop
-Patch0:                aumix-home_etc.patch
-Patch1:                aumix-xaumix.patch
+Source1:       %{name}.init
+Source2:       %{name}.sysconfig
+Source3:       x%{name}.desktop
+Patch0:                %{name}-home_etc.patch
+Patch1:                %{name}-xaumix.patch
 URL:           http://www.jpj.net/~trevor/aumix.html
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gpm-devel
@@ -25,6 +28,10 @@ BuildRequires:       gettext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     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
 sound card's mixer. It lets you adjust the input levels from the CD,
@@ -68,6 +75,7 @@ CD, ͦ
 Summary:       Saves/restores mixer settings on system shutdown/startup
 Summary(pl):   Zapisuje/odtwarza ustawienia przy zamkniêciu/starcie systemu
 Group:         Applications/Sound
+Group(de):     Applikationen/Laut
 Group(pl):     Aplikacje/D¼wiêk
 Requires:      %{name} = %{version}
 Prereq:                rc-scripts >= 0.2.0
@@ -89,36 +97,35 @@ systemu.
 %patch1 -p1
 
 %build
-automake
+aclocal
 autoconf
+automake -a -c
 gettextize --copy --force
 
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses"
-LDFLAGS="-s"
-export CFLAGS LDFLAGS
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 %configure --without-gtk
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Multimedia \
-$RPM_BUILD_ROOT%{_prefix}/X11R6/{bin,share/pixmaps} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}} \
+       $RPM_BUILD_ROOT{%{_xbindir},%{_xmandir}/man1} \
+       $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_bindir}/xaumix $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-mv $RPM_BUILD_ROOT%{_datadir}/aumix/*xpm \
-$RPM_BUILD_ROOT%{_prefix}/X11R6/share/pixmaps
+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}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/aumix
-install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+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
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       AUTHORS BUGS ChangeLog NEWS README 
+gzip -9nf AUTHORS BUGS ChangeLog NEWS README TODO
 
 %find_lang %{name}
 
@@ -143,19 +150,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-
-%config(noreplace,missingok) %{_sysconfdir}/aumixrc
-%doc {AUTHORS,BUGS,ChangeLog,NEWS,README}.gz
+%doc {AUTHORS,BUGS,ChangeLog,NEWS,README,TODO}.gz
+%config(noreplace,missingok) %verify(not size mtime md5) %{_sysconfdir}/aumixrc
 
 %attr(755,root,root) %{_bindir}/aumix
-%attr(755,root,root) %{_prefix}/X11R6/bin/xaumix
+%{_mandir}/man1/*
+%{_datadir}/aumix
 
-%{_prefix}/X11R6/share/pixmaps/*.xpm
+%attr(755,root,root) %{_xbindir}/xaumix
+%{_xmandir}/man1/*
+%{_pixmapsdir}/*.xpm
 %{_applnkdir}/Multimedia/xaumix.desktop
 
-%{_datadir}/aumix
-%{_mandir}/man1/*
-
 %files OSS-preserve-settings
 %defattr(644,root,root,755)
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/aumix
+%attr(754,root,root) /etc/rc.d/init.d/aumix
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/aumix

diff --git a/aumix.sysconfig b/aumix.sysconfig
new file mode 100644 (file)
index 0000000..1530f4d
--- /dev/null
+++ b/aumix.sysconfig
@@ -0,0 +1,7 @@
+# Customized settings for aumix-OSS-preserve-settings
+
+# Do you want mixer settings to be initialized on boot?
+AUMIX_AUTO_INIT=yes
+
+# Do you want mixer settings to be saved on shutdown?
+AUMIX_AUTO_SAVE=yes