From 6f53cbc04608b8b82a9f05801131fc390800201b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 24 2014 23:18:25 +0000 Subject: 1.0.28 --- diff --git a/.gitignore b/.gitignore index 8f58b07..d7b380e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1 @@ -alsa-utils-1.0.7.tar.bz2 -alsa-utils-1.0.8.tar.bz2 -alsa-utils-1.0.9rc2.tar.bz2 -alsa-utils-1.0.9.tar.bz2 -alsacard.c -alsa-utils-1.0.9a.tar.bz2 -alsa-utils-1.0.10rc1.tar.bz2 -alsa-utils-1.0.10.tar.bz2 -alsa-utils-1.0.11rc2.tar.bz2 -alsa-lib-1.0.11.tar.bz2 -alsa-utils-1.0.11.tar.bz2 -alsa-utils-1.0.12rc2.tar.bz2 -alsa-utils-1.0.12.tar.bz2 -alsa-utils-1.0.14rc1.tar.bz2 -alsa-utils-1.0.14rc2.tar.bz2 -alsa-utils-1.0.14.tar.bz2 -alsa-utils-1.0.15rc1.tar.bz2 -alsa-utils-1.0.16.tar.bz2 -alsa-utils-1.0.17.tar.bz2 -alsa-utils-1.0.18rc3.tar.bz2 -alsa-utils-1.0.18.tar.bz2 -alsa-utils-1.0.19.tar.bz2 -alsa-utils-1.0.20.tar.bz2 -alsa-utils-1.0.21.tar.bz2 -alsa-utils-1.0.22.tar.bz2 -alsa-utils-1.0.23.tar.bz2 -/alsa-utils-1.0.24.tar.bz2 -/alsa-utils-1.0.24.1.tar.bz2 -/alsa-utils-1.0.25.tar.bz2 -/alsa-utils-1.0.26.tar.bz2 -/alsa-utils-1.0.27.tar.bz2 -/alsa-utils-1.0.27.1.tar.bz2 -/alsa-utils-1.0.27.2.tar.bz2 +/alsa-utils-1.*.tar.bz2 diff --git a/alsa-utils.spec b/alsa-utils.spec index 94b5314..f9b4cc0 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.0.27 -%define fixversion .2 +%define baseversion 1.0.28 +#define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 6%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -18,22 +18,18 @@ Source11: alsactl.conf Source20: alsa-restore.service Source21: alsa-store.service Source22: alsa-state.service -Patch1: alsactl-valist.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel BuildRequires: xmlto BuildRequires: systemd -BuildRequires: systemd-units >= 39-2 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Conflicts: udev <= 179-2 # use latest alsa-lib - the executables in this package requires latest API -Requires: alsa-lib%{?_isa} >= %{baseversion}, systemd-units >= 39-2 -Conflicts: filesystem < 3 +Requires: alsa-lib%{?_isa} >= %{baseversion} %description This package contains command line utilities for the Advanced Linux Sound @@ -41,14 +37,13 @@ Architecture (ALSA). %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .alsactl-valist %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ --with-udev-rules-dir=%{_prefix}/lib/udev/rules.d \ --with-systemdsystemunitdir=%{_unitdir} -%{__make} %{?_smp_mflags} -%{__cp} %{SOURCE4} . +make %{?_smp_mflags} +cp %{SOURCE4} . %install make install DESTDIR=$RPM_BUILD_ROOT @@ -87,7 +82,6 @@ install -p -m 755 %{SOURCE6} %{buildroot}/usr/bin/alsa-info ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING ChangeLog README TODO %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* @@ -128,6 +122,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Thu Jul 24 2014 Peter Robinson 1.0.28-1 +- Update to 1.0.28 + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.27.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/alsactl-valist.patch b/alsactl-valist.patch deleted file mode 100644 index d131ef7..0000000 --- a/alsactl-valist.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/alsactl/utils.c b/alsactl/utils.c -index 072c239..b5d183c 100644 ---- a/alsactl/utils.c -+++ b/alsactl/utils.c -@@ -150,10 +150,10 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...) - - if (!cond && !debugflag) - return; -+ va_start(ap, fmt); - if (use_syslog) { - syslog_(LOG_ERR, fcn, line, fmt, ap); - } else { -- va_start(ap, fmt); - fprintf(stderr, "%s: %s:%ld: ", command, fcn, line); - vfprintf(stderr, fmt, ap); - putc('\n', stderr); -@@ -167,10 +167,10 @@ void dbg_(const char *fcn, long line, const char *fmt, ...) - - if (!debugflag) - return; -+ va_start(ap, fmt); - if (use_syslog) { - syslog_(LOG_DEBUG, fcn, line, fmt, ap); - } else { -- va_start(ap, fmt); - fprintf(stderr, "%s: %s:%ld: ", command, fcn, line); - vfprintf(stderr, fmt, ap); - putc('\n', stderr); diff --git a/sources b/sources index 7cc6b55..c72d592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b65e9a04181bd7c9db7667a4566f8dc3 alsa-utils-1.0.27.2.tar.bz2 +361552d5b1cacd0a1e7ba09e69990211 alsa-utils-1.0.28.tar.bz2