From a577d8eaee2b4c99c5c558721a3396c63d33766f4ae66bb7d9e6d373aedc6ae2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 13 Feb 2017 12:56:07 +0000 Subject: [PATCH] Accepting request 456748 from home:scarabeus_iv:branches:multimedia:libs Fix typo in previous submission udevdir vs udevrulesdir OBS-URL: https://build.opensuse.org/request/show/456748 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=208 --- alsa-lib-doxygen-avoid-crash-for-11.3.diff | 21 --------- alsa.changes | 10 ++++ alsa.spec | 53 ++++++---------------- 3 files changed, 25 insertions(+), 59 deletions(-) delete mode 100644 alsa-lib-doxygen-avoid-crash-for-11.3.diff diff --git a/alsa-lib-doxygen-avoid-crash-for-11.3.diff b/alsa-lib-doxygen-avoid-crash-for-11.3.diff deleted file mode 100644 index 35c4ea8..0000000 --- a/alsa-lib-doxygen-avoid-crash-for-11.3.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in -index f4499d6..6bd6486 100644 ---- a/doc/doxygen.cfg.in -+++ b/doc/doxygen.cfg.in -@@ -77,7 +77,6 @@ INPUT = @top_srcdir@/doc/index.doxygen \ - @top_srcdir@/src/rawmidi \ - @top_srcdir@/src/timer \ - @top_srcdir@/src/hwdep \ -- @top_srcdir@/src/seq \ - @top_srcdir@/src/ucm - EXCLUDE = @top_srcdir@/src/control/control_local.h \ - @top_srcdir@/src/pcm/atomic.h \ -@@ -94,7 +93,7 @@ EXCLUDE = @top_srcdir@/src/control/control_local.h \ - @top_srcdir@/src/mixer/mixer_local.h \ - @top_srcdir@/src/rawmidi/rawmidi_local.h \ - @top_srcdir@/src/seq/seq_local.h \ -- @top_srcdir@/src/seq/ucm_local.h -+ @top_srcdir@/src/ucm/ucm_local.h - RECURSIVE = YES - FILE_PATTERNS = *.c *.h - EXAMPLE_PATH = @top_srcdir@/test diff --git a/alsa.changes b/alsa.changes index b87250c..2f6f82b 100644 --- a/alsa.changes +++ b/alsa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 13 10:28:23 UTC 2017 - tchvatal@suse.com + +- Drop alsa-lib-doxygen-avoid-crash-for-11.3.diff as it was applied + only in case of 11.3 and never else +- Use Requires(phase) instead of prereq string +- Use official %udevrulesdir macro instead of handbrew udevdir +- Version provides/obsoletes in devel pkg to avoid warning +- Remove hack that allowed build on SLE10 + ------------------------------------------------------------------- Wed Feb 8 08:39:05 CET 2017 - kukuk@suse.de diff --git a/alsa.spec b/alsa.spec index b14abf5..5e479c4 100644 --- a/alsa.spec +++ b/alsa.spec @@ -17,10 +17,8 @@ %define package_version 1.1.3 -%if 0%{?suse_version} > 1200 -%define _udevdir %(pkg-config --variable=udevdir udev) -%else -%define _udevdir /lib/udev +%if 0%{?suse_version} < 1200 +%define _udevrulesdir /lib/udev/rules.d/ %endif Name: alsa Version: 1.1.3 @@ -46,31 +44,24 @@ Source32: all_notes_off.mid Source34: alsa-init.sh Source40: 50-alsa.conf Source41: install-snd-module -# Patch: alsa-lib-git-fixes.diff # upstream fixes # rest suse patches -Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff BuildRequires: doxygen BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig Requires: alsa-utils -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %fillup_prereq -%if 0%{?suse_version} <= 1310 -PreReq: %insserv_prereq -%endif +Requires(post): %fillup_prereq Recommends: alsa-oss Recommends: alsa-plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} <= 1310 +Requires(post): %insserv_prereq +%endif %if 0%{?suse_version} > 1200 BuildRequires: pkgconfig(udev) %else BuildRequires: udev %endif -# bug437293 -%ifarch ppc64 -Obsoletes: alsa-64bit -%endif %description ALSA stands for Advanced Linux Sound Architecture. It supports many @@ -85,9 +76,9 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libasound2 = %{version} -Obsoletes: alsadev -Provides: alsa-lib-devel -Provides: alsadev +Obsoletes: alsadev < %{version} +Provides: alsa-lib-devel = %{version} +Provides: alsadev = %{version} %description devel This package contains all necessary include files and libraries needed @@ -117,18 +108,6 @@ Architecture. %prep %setup -q -n alsa-lib-%{package_version} -# %patch -p1 -# build fixes -%if 0%{?suse_version} == 1130 -%patch99 -p1 -%endif -# hack to fix build on older distros -%if 0%{?suse_version} < 1100 -%ifarch %{ix86} -test -f $RPM_SOURCE_DIR/baselibs.conf && \ -sed -i -e'/recommends.*alsa-oss/d' $RPM_SOURCE_DIR/baselibs.conf -%endif -%endif %build export AUTOMAKE_JOBS="%{?_smp_mflags}" @@ -146,7 +125,7 @@ make -C doc doc %{?_smp_mflags} %install # install shared library -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # clean up unneeded files rm -f %{buildroot}%{_libdir}/*.*a # rm -f %{buildroot}%{_libdir}/alsa-lib/smixer/*.*a @@ -187,11 +166,11 @@ ln -s ../..%{_initddir}/joystick %{buildroot}%{_sbindir}/rcjoystick # # udev rules (only for non-systemd) # -mkdir -p %{buildroot}%{_udevdir}/rules.d +mkdir -p %{buildroot}%{_udevrulesdir} %if 0%{?suse_version} < 1140 -install -c -m 0644 %{SOURCE8} %{buildroot}%{_udevdir}/rules.d +install -c -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir} %endif -install -c -m 0644 %{SOURCE9} %{buildroot}%{_udevdir}/rules.d +install -c -m 0644 %{SOURCE9} %{buildroot}%{_udevrulesdir} # # modprobe config and the module install script for loading OSS-emulation # and sequencer modules automatically @@ -230,7 +209,6 @@ cp doc/asoundrc.txt %{buildroot}%{_docdir}/%{name}/alsa-lib exit 0 %if 0%{?suse_version} <= 1310 - %preun %stop_on_removal alsasound joystick exit 0 @@ -242,7 +220,6 @@ exit 0 %endif %post -n libasound2 -p /sbin/ldconfig - %postun -n libasound2 -p /sbin/ldconfig %files @@ -260,7 +237,7 @@ exit 0 %{_prefix}/lib/all_notes_off.* %{_datadir}/sounds/alsa %{_localstatedir}/adm/fillup-templates/* -%{_udevdir}/rules.d/* +%{_udevrulesdir}* %files devel %defattr(-, root, root)