diff --git a/0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch b/0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch new file mode 100644 index 0000000..b3e30e5 --- /dev/null +++ b/0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch @@ -0,0 +1,25 @@ +From 3616b1fe3ca603832b2f88abeb722cba2f0dde7e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Mon, 15 Apr 2013 11:20:41 +0200 +Subject: [PATCH] alsactl: Fix a typo in systemd alsa-restore.service + +Signed-off-by: Takashi Iwai +--- + alsactl/alsa-restore.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +index ab3c30d..245a439 100644 +--- a/alsactl/alsa-restore.service.in ++++ b/alsactl/alsa-restore.service.in +@@ -12,6 +12,6 @@ Before=shutdown.target + Conflicts=shutdown.target + + [Service] +-Type=oneshop ++Type=oneshot + ExecStart=-@sbindir@/alsactl restore + StandardOutput=syslog +-- +1.8.2.1 + diff --git a/alsa-utils.changes b/alsa-utils.changes index d16e1cd..9574494 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 15 11:26:41 CEST 2013 - tiwai@suse.de + +- Replace the previous fix with the upstream patch + ------------------------------------------------------------------- Sat Apr 13 15:39:49 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/alsa-utils.spec b/alsa-utils.spec index e0aecba..96d2432 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -57,8 +57,9 @@ Release: 0 Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2 Source1: 01beep.conf # Patch: alsa-utils-git-fixes.diff -# PATCH-FIX-OPENSUSE service_typo.patch -- Fixes the typo in systemd service -Patch0: service_typo.patch +# upstream fix patches +Patch1: 0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch +# Patch99: alsa-utils-gettext-version-removal.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,7 +74,8 @@ Sound Architecture. sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* # patch -p1 -%patch0 -p1 +%patch1 -p1 +# %if %suse_version < 1020 %patch99 -p1 %endif diff --git a/service_typo.patch b/service_typo.patch deleted file mode 100644 index 334612d..0000000 --- a/service_typo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urNB orig.alsa-utils-1.0.27/alsactl/alsa-restore.service.in alsa-utils-1.0.27/alsactl/alsa-restore.service.in ---- orig.alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-11 13:43:06.000000000 +0200 -+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-13 17:37:45.268316370 +0200 -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog