OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=32

alsa-utils-alsamixer-old-ncurses-fix.diff

@@ -0,0 +1,13 @@
+diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
+index 7a5ffdc..388f962 100644
+--- a/alsamixer/mainloop.c
++++ b/alsamixer/mainloop.c
+@@ -45,7 +45,7 @@ void initialize_curses(bool use_color)
+ 	cbreak();
+ 	noecho();
+ #ifdef NCURSES_VERSION
+-	set_escdelay(100);
++	// set_escdelay(100);
+ #endif
+ 	window_size_changed(); /* update screen_lines/cols */
+ 	init_colors(use_color);

alsa-utils-gettext-version-removal.diff

@@ -0,0 +1,12 @@
+diff -r ff4c1a926a82 configure.in
+--- a/configure.in	Mon Jun 04 15:15:39 2007 +0200
++++ b/configure.in	Wed Jun 06 14:25:19 2007 +0200
+@@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE(alsa-utils, 1.0.14)
+ AM_INIT_AUTOMAKE(alsa-utils, 1.0.14)
+ 
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.15])
++dnl AM_GNU_GETTEXT_VERSION([0.15])
+ 
+ dnl Checks for programs.
+ 

alsa-utils.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jun  2 16:40:29 CEST 2009 - tiwai@suse.de
+
+- fix alsamixer man page about capture elements
+
+-------------------------------------------------------------------
+Fri May 29 14:45:13 CEST 2009 - tiwai@suse.de
+
+- sync with the upstream:
+  * alsamixer code rewrite
+  * more alsactl init fixes
+  * translations updates
+
+-------------------------------------------------------------------
+Wed May 20 10:33:27 CEST 2009 - tiwai@suse.de
+
+- speaker-test minor clean-ups
+- fix alsactl init headphone volume setup
+
 -------------------------------------------------------------------
 Wed May  6 18:07:23 CEST 2009 - tiwai@suse.de
 

alsa-utils.spec

@@ -28,9 +28,12 @@ Requires:       dialog pciutils
 AutoReqProv:    on
 Summary:        Advanced Linux Sound Architecture Utilities
 Version:        1.0.20
-Release:        1
+Release:        2
 Source:         ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-# Patch:          alsa-utils-git-fixes.diff
+Patch:          alsa-utils-git-fixes.diff
+Patch1:         alsa-utils-gettext-version-removal.diff
+Patch2:         alsa-utils-po-pre-patch.diff
+Patch3:         alsa-utils-alsamixer-old-ncurses-fix.diff
 Url:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -48,13 +51,29 @@ Authors:
 %prep
 %setup -q -n %{name}-%{package_version}
 # fix stupid automake's automatic action
-# sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
-# %patch -p1
-mv alsamixer/README alsamixer/README-alsamixer
+sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
+# fix po changes in tarball first
+%patch2 -p1
+rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-*
+%patch -p1
+%if %suse_version < 1020
+%patch1 -p1
+%endif
+%if %suse_version < 1110
+%patch3 -p1
+%endif
 
 %build
+%if %suse_version < 1020
+gettextize -f
+%endif
 autoreconf -fi
-%configure --with-curses=ncursesw
+%if %suse_version < 1030
+%define moreopts  --disable-xmlto
+%else
+%define moreopts
+%endif
+%configure --with-curses=ncursesw %moreopts
 make %{?jobs:-j %jobs}
 
 %install
@@ -67,7 +86,6 @@ make %{?jobs:-j %jobs}
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc COPYING ChangeLog INSTALL README TODO
-%doc alsamixer/README*
 %doc seq/aconnect/README*
 %doc seq/aseqnet/README*
 %doc %{_mandir}/man*/*
@@ -78,6 +96,16 @@ make %{?jobs:-j %jobs}
 %{_datadir}/alsa
 
 %changelog
+* Tue Jun 02 2009 tiwai@suse.de
+- fix alsamixer man page about capture elements
+* Fri May 29 2009 tiwai@suse.de
+- sync with the upstream:
+  * alsamixer code rewrite
+  * more alsactl init fixes
+  * translations updates
+* Wed May 20 2009 tiwai@suse.de
+- speaker-test minor clean-ups
+- fix alsactl init headphone volume setup
 * Wed May 06 2009 tiwai@suse.de
 - updated to version 1.0.20:
   * including previous patches