From 0045e828b89796002cd73eff78feb2374b112d5e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 8 Jun 2013 08:58:11 +0200 Subject: [PATCH] - updated to 1.0.27.1 - removed obsolete build,alsactl-fix,fix_service_restore patches - udev rules dropped in favour of systemd service --- alsa-utils-build.patch | 12 ------------ alsa-utils-fix_service_restore.patch | 11 ----------- alsa-utils.spec | 13 +++---------- alsactl-fix.patch | 13 ------------- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 alsa-utils-build.patch delete mode 100644 alsa-utils-fix_service_restore.patch delete mode 100644 alsactl-fix.patch diff --git a/alsa-utils-build.patch b/alsa-utils-build.patch deleted file mode 100644 index a22013f..0000000 --- a/alsa-utils-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN alsa-utils-1.0.27.org/alsactl/utils.c alsa-utils-1.0.27/alsactl/utils.c ---- alsa-utils-1.0.27.org/alsactl/utils.c 2013-04-11 13:43:06.000000000 +0200 -+++ alsa-utils-1.0.27/alsactl/utils.c 2013-04-14 21:02:26.968631825 +0200 -@@ -111,7 +111,7 @@ - buf[sizeof(buf)-1] = '\0'; - vsnprintf(buf + strlen(buf), sizeof(buf)-strlen(buf), fmt, ap); - buf[sizeof(buf)-1] = '\0'; -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - } - - void info_(const char *fcn, long line, const char *fmt, ...) diff --git a/alsa-utils-fix_service_restore.patch b/alsa-utils-fix_service_restore.patch deleted file mode 100644 index 37dc17f..0000000 --- a/alsa-utils-fix_service_restore.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN alsa-utils-1.0.27.orig/alsactl/alsa-restore.service.in alsa-utils-1.0.27/alsactl/alsa-restore.service.in ---- alsa-utils-1.0.27.orig/alsactl/alsa-restore.service.in 2013-04-11 13:43:06.000000000 +0200 -+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-05-12 21:39:52.000000000 +0200 -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog diff --git a/alsa-utils.spec b/alsa-utils.spec index 536b19c..daff892 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,22 +5,19 @@ Summary(pt_BR.UTF-8): Utilitários para o ALSA (Advanced Linux Sound Architectur Summary(ru.UTF-8): Утилиты командной строки для ALSA project Summary(uk.UTF-8): Утиліти командного рядка для ALSA project Name: alsa-utils -Version: 1.0.27 -Release: 4 +Version: 1.0.27.1 +Release: 1 # some apps GPL v2, some GPL v2+ License: GPL v2 Group: Applications/Sound Source0: ftp://ftp.alsa-project.org/pub/utils/%{name}-%{version}.tar.bz2 -# Source0-md5: cbfb21a24f63fb052b3392195639ce48 +# Source0-md5: 3d81357b997744a139881ef72bc6921a Source1: alsasound.init # does anything use this (probably outdated) file? not alsasound.init Source2: alsa-oss-pcm Source3: alsactl.conf Patch0: %{name}-fast_sampling.patch Patch1: %{name}-modprobe.patch -Patch2: %{name}-build.patch -Patch3: alsactl-fix.patch -Patch4: %{name}-fix_service_restore.patch URL: http://www.alsa-project.org/ BuildRequires: alsa-lib-devel >= 1.0.26 BuildRequires: autoconf >= 2.59 @@ -107,9 +104,6 @@ Skrypt init dla Advanced Linux Sound Architecture. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %{__gettextize} @@ -202,7 +196,6 @@ fi %{systemdunitdir}/alsa-store.service %{systemdunitdir}/basic.target.wants/alsa-restore.service %{systemdunitdir}/shutdown.target.wants/alsa-store.service -/lib/udev/rules.d/90-alsa-restore.rules %dir /var/lib/alsa %dir /lib/alsa /lib/alsa/init diff --git a/alsactl-fix.patch b/alsactl-fix.patch deleted file mode 100644 index 344255e..0000000 --- a/alsactl-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/alsactl/lock.c b/alsactl/lock.c -index d34d013..fce208b 100644 ---- a/alsactl/lock.c -+++ b/alsactl/lock.c -@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) - int fd = -1, err = 0; - struct flock lck; - struct stat st; -- char lcktxt[11]; -+ char lcktxt[12]; - char *nfile; - - if (!do_lock) -- 2.44.0