- pass include path for ncurses in CPPFLAGS, not CFLAGS (fixes build)

[packages/aumix.git] / aumix.spec

diff --git a/aumix.spec b/aumix.spec
index 3a1fb04573826797f143850c076457838d222c38..fe0a071561b05c980716125d1d2f263275d682e4 100644 (file)
--- a/aumix.spec
+++ b/aumix.spec
@@ -8,23 +8,31 @@ Summary(ru):  
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
 Version:       2.7
 Summary(uk):   áÕÄ¦Ï Í¦ËÛÅÒ, ÂÁÚÏ×ÁÎÉÊ ÎÁ ¦ÂÌÉÏÔÅæ curses
 Name:          aumix
 Version:       2.7

-Release:       1
+Release:       5

 License:       GPL
 Group:         Applications/Sound
 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
 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
+Patch2:                %{name}-ac250.patch

 URL:           http://www.jpj.net/~trevor/aumix.html
 URL:           http://www.jpj.net/~trevor/aumix.html

+BuildRequires: autoconf

 BuildRequires: automake
 BuildRequires: automake

-BuildRequires: ncurses-devel >= 5.0

 BuildRequires: gpm-devel
 BuildRequires: gettext-devel
 BuildRequires: gpm-devel
 BuildRequires: gettext-devel

+BuildRequires: ncurses-devel >= 5.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     aumix-gtk
 
 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,
 %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,


@@ -43,10 +51,10 @@ d'entr
 le volume de sortie.
 
 %description -l pl
 le volume de sortie.
 
 %description -l pl

-Ten program przynosi bazuj±c± na tty, interaktywn± metodê
+Ten pakiet dostarcza bazuj±c± na tty, interaktywn± metodê

 kontrolowania miksera karty d¼wiêkowej. aumix pozwala zmieniaæ poziom
 kontrolowania miksera karty d¼wiêkowej. aumix pozwala zmieniaæ poziom

-sygna³u nadchodz±cego z CD, mikrofonu i syntetyzerów tak samo jak
-poziom sygna³u wyj¶ciowego.
+sygna³u nadchodz±cego z CD, mikrofonu i syntetyzerów, a tak¿e poziom
+sygna³u wyj¶ciowego.

 
 %description -l tr
 Bu program metin ekranda, etkileþimli olarak ses kartý mixer denetimi
 
 %description -l tr
 Bu program metin ekranda, etkileþimli olarak ses kartý mixer denetimi


@@ -68,9 +76,11 @@ CD, ͦ
 Summary:       Saves/restores mixer settings on system shutdown/startup
 Summary(pl):   Zapisuje/odtwarza ustawienia przy zamkniêciu/starcie systemu
 Group:         Applications/Sound
 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}
 Group(pl):     Aplikacje/D¼wiêk
 Requires:      %{name} = %{version}

-Requires:      rc-scripts >= 0.2.0
+Prereq:                rc-scripts >= 0.2.0
+Prereq:                /sbin/chkconfig

 Obsoletes:     rhsound
 Conflicts:     alsa-utils
 
 Obsoletes:     rhsound
 Conflicts:     alsa-utils
 


@@ -78,7 +88,7 @@ Conflicts:    alsa-utils
 This package contains script, which will save settings of sound card's
 mixer on system shutdown and restore them on system startup.
 
 This package contains script, which will save settings of sound card's
 mixer on system shutdown and restore them on system startup.
 

-%description -l pl OSS-preserve-settings
+%description OSS-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.
 Ten pakiet zawiera skrypt, który zapisuje ustawienia miksera karty
 d¼wiêkowej przy zamkniêciu systemu i odtwarza je po uruchomieniu
 systemu.


@@ -87,41 +97,46 @@ systemu.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 
 %build
 
 %build

-automake
-autoconf
+rm -f missing acinclude.m4

 gettextize --copy --force
 gettextize --copy --force

+aclocal
+autoconf
+automake -a -c

 
 

-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses"
-LDFLAGS="-s"
-export CFLAGS LDFLAGS
-%configure --without-gtk
+CPPFLAGS="-I/usr/include/ncurses" \
+%configure \
+       --without-gtk

 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__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
 
 
 %{__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
 
 
 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}
 
 
 %find_lang %{name}
 

+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %post OSS-preserve-settings
 /sbin/chkconfig --add aumix
 if [ ! -f /var/lock/subsys/aumix ]; then
 %post OSS-preserve-settings
 /sbin/chkconfig --add aumix
 if [ ! -f /var/lock/subsys/aumix ]; then


@@ -138,24 +153,21 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del aumix
 fi
 
        /sbin/chkconfig --del aumix
 fi
 

-%clean
-rm -rf $RPM_BUILD_ROOT
-

 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %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) %{_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
 
 %{_applnkdir}/Multimedia/xaumix.desktop
 

-%{_datadir}/aumix
-%{_mandir}/man1/*
-

 %files OSS-preserve-settings
 %defattr(644,root,root,755)
 %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