rpms/alsa-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1.0.28

Browse Source
This commit is contained in:
Peter Robinson 2014-07-25 00:18:25 +01:00
parent 6f5f971afd
commit 6f53cbc046
4 changed files with 12 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.gitignore vendored
View File

@ -1,33 +1 @@
alsa-utils-1.0.7.tar.bz2 /alsa-utils-1.*.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

23
alsa-utils.spec
View File

@ -1,11 +1,11 @@
%define baseversion 1.0.27 %define baseversion 1.0.28
%define fixversion .2 #define fixversion .2
%global _hardened_build 1 %global _hardened_build 1
Summary: Advanced Linux Sound Architecture (ALSA) utilities Summary: Advanced Linux Sound Architecture (ALSA) utilities
Name: alsa-utils Name: alsa-utils
Version: %{baseversion}%{?fixversion} Version: %{baseversion}%{?fixversion}
Release: 6%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.alsa-project.org/ URL: http://www.alsa-project.org/
@ -18,22 +18,18 @@ Source11: alsactl.conf
Source20: alsa-restore.service Source20: alsa-restore.service
Source21: alsa-store.service Source21: alsa-store.service
Source22: alsa-state.service Source22: alsa-state.service
Patch1: alsactl-valist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: alsa-lib-devel >= %{baseversion}
BuildRequires: libsamplerate-devel BuildRequires: libsamplerate-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-units >= 39-2
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Conflicts: udev <= 179-2
# use latest alsa-lib - the executables in this package requires latest API # use latest alsa-lib - the executables in this package requires latest API
Requires: alsa-lib%{?_isa} >= %{baseversion}, systemd-units >= 39-2 Requires: alsa-lib%{?_isa} >= %{baseversion}
Conflicts: filesystem < 3
%description %description
This package contains command line utilities for the Advanced Linux Sound This package contains command line utilities for the Advanced Linux Sound
@ -41,14 +37,13 @@ Architecture (ALSA).
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 -b .alsactl-valist
%build %build
%configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ %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-udev-rules-dir=%{_prefix}/lib/udev/rules.d \
--with-systemdsystemunitdir=%{_unitdir} --with-systemdsystemunitdir=%{_unitdir}
%{__make} %{?_smp_mflags} make %{?_smp_mflags}
%{__cp} %{SOURCE4} . cp %{SOURCE4} .
%install %install
make install DESTDIR=$RPM_BUILD_ROOT 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 ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog README TODO %doc COPYING ChangeLog README TODO
%config /etc/alsa/* %config /etc/alsa/*
%{_prefix}/lib/udev/rules.d/* %{_prefix}/lib/udev/rules.d/*
@ -128,6 +122,9 @@ fi
%systemd_postun_with_restart alsa-state.service %systemd_postun_with_restart alsa-state.service
%changelog %changelog
* Thu Jul 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-1
- Update to 1.0.28
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27.2-6 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

28
alsactl-valist.patch
View File

@ -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);

2
sources
View File

@ -1 +1 @@
b65e9a04181bd7c9db7667a4566f8dc3 alsa-utils-1.0.27.2.tar.bz2 361552d5b1cacd0a1e7ba09e69990211 alsa-utils-1.0.28.tar.bz2