Hello community,

here is the log from the commit of package alsa for openSUSE:Factory checked in 
at 2017-02-16 16:44:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa (Old)
 and      /work/SRC/openSUSE:Factory/.alsa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "alsa"

Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa/alsa.changes        2017-01-04 
19:28:30.519680160 +0100
+++ /work/SRC/openSUSE:Factory/.alsa.new/alsa.changes   2017-02-16 
16:44:11.957229180 +0100
@@ -1,0 +2,15 @@
+Mon Feb 13 10:28:23 UTC 2017 - tchva...@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 - ku...@suse.de
+
+- Don't require insserv if we don't need it.
+
+-------------------------------------------------------------------

Old:
----
  alsa-lib-doxygen-avoid-crash-for-11.3.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.GEByTC/_old  2017-02-16 16:44:13.109065607 +0100
+++ /var/tmp/diff_new_pack.GEByTC/_new  2017-02-16 16:44:13.113065040 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package alsa
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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,29 +44,24 @@
 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
-PreReq:         %insserv_prereq
+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
@@ -83,9 +76,9 @@
 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
@@ -115,18 +108,6 @@
 
 %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}"
@@ -144,7 +125,7 @@
 
 %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
@@ -185,11 +166,11 @@
 #
 # 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
@@ -228,7 +209,6 @@
 exit 0
 
 %if 0%{?suse_version} <= 1310
-
 %preun
 %stop_on_removal alsasound joystick
 exit 0
@@ -240,7 +220,6 @@
 %endif
 
 %post -n libasound2 -p /sbin/ldconfig
-
 %postun -n libasound2 -p /sbin/ldconfig
 
 %files
@@ -258,7 +237,7 @@
 %{_prefix}/lib/all_notes_off.*
 %{_datadir}/sounds/alsa
 %{_localstatedir}/adm/fillup-templates/*
-%{_udevdir}/rules.d/*
+%{_udevrulesdir}*
 
 %files devel
 %defattr(-, root, root)





Reply via email to