Hello community,

here is the log from the commit of package alsa-utils for openSUSE:Factory 
checked in at 2014-07-08 16:58:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old)
 and      /work/SRC/openSUSE:Factory/.alsa-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "alsa-utils"

Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes    2014-06-25 
06:57:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes       
2014-07-08 16:58:49.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Jul  1 16:42:31 CEST 2014 - ti...@suse.de
+
+- Remove obsoleted *.po files
+- Backport upstream fixes:
+  0001-alsactl-save-state-do-not-call-rename-for-stdio.patch
+  0002-alsamixer-include-missing-mixer_controls.h.patch
+
+-------------------------------------------------------------------

Old:
----
  de.po
  fr.po
  ja.po

New:
----
  0001-alsactl-save-state-do-not-call-rename-for-stdio.patch
  0002-alsamixer-include-missing-mixer_controls.h.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.9gR0uL/_old  2014-07-08 16:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.9gR0uL/_new  2014-07-08 16:58:52.000000000 +0200
@@ -43,11 +43,10 @@
 Url:            http://www.alsa-project.org/
 Source:         
ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
 Source1:        01beep.conf
-Source10:       de.po
-Source11:       fr.po
-Source12:       ja.po
 # Patch:          alsa-utils-git-fixes.diff
 # upstream fix patches
+Patch1:         0001-alsactl-save-state-do-not-call-rename-for-stdio.patch
+Patch2:         0002-alsamixer-include-missing-mixer_controls.h.patch
 #
 Patch99:        alsa-utils-gettext-version-removal.diff
 BuildRequires:  alsa-devel
@@ -74,11 +73,9 @@
 # fix stupid automake's automatic action
 sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
 # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-*
-# temporarily use the original *.po files instead of the ones in tarball
-cp %{SOURCE10} po/
-cp %{SOURCE11} po/
-cp %{SOURCE12} po/
 # patch -p1
+%patch1 -p1
+%patch2 -p1
 #
 %if 0%{?suse_version} < 1020
 %patch99 -p1

++++++ 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch ++++++
>From 03a652e18ddc2eaad9b6ff3653515d54bd273d75 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <pe...@perex.cz>
Date: Wed, 25 Jun 2014 10:47:21 +0200
Subject: [PATCH 1/2] alsactl: save state - do not call rename for stdio

Signed-off-by: Jaroslav Kysela <pe...@perex.cz>
---
 alsactl/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alsactl/state.c b/alsactl/state.c
index c33f5017999f..e0c6f2e02e9b 100644
--- a/alsactl/state.c
+++ b/alsactl/state.c
@@ -1626,7 +1626,7 @@ int save_state(const char *file, const char *cardname)
        snd_output_close(out);
        if (err < 0) {
                error("snd_config_save: %s", snd_strerror(err));
-       } else {
+       } else if (nfile) {
                err = rename(nfile, file);
                if (err < 0)
                        error("rename failed: %s (%s)", strerror(-err), file);
-- 
2.0.0

++++++ 0002-alsamixer-include-missing-mixer_controls.h.patch ++++++
>From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <pe...@perex.cz>
Date: Wed, 25 Jun 2014 10:49:23 +0200
Subject: [PATCH 2/2] alsamixer: include missing mixer_controls.h

---
 alsamixer/mainloop.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
index 351f57f8590e..79d81a99cfc1 100644
--- a/alsamixer/mainloop.c
+++ b/alsamixer/mainloop.c
@@ -29,6 +29,7 @@
 #include "widget.h"
 #include "mixer_widget.h"
 #include "mixer_display.h"
+#include "mixer_controls.h"
 #include "mainloop.h"
 
 static WINDOW *curses_initialized;
-- 
2.0.0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to