Hello community,
here is the log from the commit of package alsa
checked in at Tue Apr 17 00:28:28 CEST 2007.
--------
--- alsa/alsa.changes 2007-04-10 18:56:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2007-04-16 14:14:11.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 16 14:13:26 CEST 2007 - tiwai@suse.de
+
+- split library files to libasound2 sub package
+- split alsa-utils and alsa-oss to own sub packages
+- remove static library and unneeded files
+
+-------------------------------------------------------------------
Old:
----
alsa-oss-1.0.12.tar.bz2
alsa-oss-hg-fixes.diff
alsa-utils-1.0.14rc2.tar.bz2
alsa-utils-hg-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.f20678/_old 2007-04-17 00:28:07.000000000 +0200
+++ /var/tmp/diff_new_pack.f20678/_new 2007-04-17 00:28:07.000000000 +0200
@@ -11,22 +11,18 @@
# norootforbuild
Name: alsa
-BuildRequires: doxygen ncurses-devel
+BuildRequires: doxygen
%define package_version 1.0.14rc3
License: GNU General Public License (GPL)
Group: System/Libraries
-Provides: alsa-lib alsa-utils alsa-conf
-Requires: dialog pciutils
+Requires: libasound2 alsa-utils
+Recommends: alsa-plugins alsa-oss
PreReq: %insserv_prereq %fillup_prereq
Autoreqprov: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.13
-Release: 39
-Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
-# Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-1.0.14rc2.tar.bz2
-# Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2
-Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-1.0.12.tar.bz2
+Release: 40
+Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source6: udev-soundfont
Source7: load-soundfont
Source8: 40-alsa.rules
@@ -42,31 +38,28 @@
Source31: all_notes_off.bin
Source32: all_notes_off.mid
Patch1: alsa-lib-hg-fixes.diff
-Patch2: alsa-utils-hg-fixes.diff
-Patch3: alsa-oss-hg-fixes.diff
-Recommends: alsa-plugins
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
ALSA stands for Advanced Linux Sound Architecture. It supports many
-PCI and ISA PnP sound cards.
+PCI, ISA PnP and USB sound cards.
-This package contains the standard ALSA library, utilities, and init
-scripts to start the sound system on your Linux box. To set it up, run
-yast2 or alsaconf. They detect ALSA-supported PCI and ISA PnP cards.
+This package contains the ALSA init scripts to start the sound system
+on your Linux box. To set it up, run yast2 or alsaconf.
Authors:
--------
Jaroslav Kysela
+ Takashi Iwai
%package devel
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/C and C++
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
-Requires: glibc-devel %{name}
+Requires: glibc-devel, libasound2 = %{name}
Obsoletes: alsadev
Provides: alsadev alsa-lib-devel
@@ -78,7 +71,10 @@
Authors:
--------
- Jaroslav Kysela
+ Jaroslav Kysela
+ Takashi Iwai
+ Abramo Bagnara
+ Frank van de Pol
%package docs
Summary: Additional Package Documentation.
@@ -93,58 +89,41 @@
Authors:
--------
- Jaroslav Kysela
+ Jaroslav Kysela
+ Takashi Iwai
+ Abramo Bagnara
+ Frank van de Pol
+
+%package -n libasound2
+Summary: Advanced Linux Sound Architecture Library
+Group: System/Libraries
+Provides: alsa-lib
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+
+%description -n libasound2
+This package contains the library for ALSA, Advanced Linux Sound
+Architecture.
+
+
+
+Authors:
+--------
+ Jaroslav Kysela
+ Takashi Iwai
+ Abramo Bagnara
+ Frank van de Pol
%prep
-%setup -c -n alsa -T -a 1 -a 2 -a 5
-cd alsa-lib*/.
+%setup -n alsa-lib-%{package_version}
%patch1 -p1
-cd ..
-cd alsa-utils*/.
-%patch2 -p1
-cd ..
-cd alsa-oss*/.
-%patch3 -p1
-cd ..
-%{?suse_update_config:%{suse_update_config -f alsa-lib*/. alsa-utils*/. alsa-oss*/.}}
+%{?suse_update_config:%{suse_update_config -f .}}
%build
-ALSA_ROOT=`pwd`
-ALSA_ROOT_INC=$ALSA_ROOT/alsa-lib-%{package_version}/include
-ALSA_ROOT_LIB=$ALSA_ROOT/alsa-lib-%{package_version}/src/.libs
-ALSA_ROOT_ACLOCAL=$ALSA_ROOT/alsa-lib-%{package_version}/utils
-#
# build alsa-lib
-#
-cd alsa-lib*/.
autoreconf -fi
-#
-# needed an extra option for MIPS
-#
%ifarch mips
ARCH_CFLAGS="-mips2"
%endif
-#
-# now, build the static library at first.
-# due to gratuitous use of #ifdef PIC, we cannot build shared and static
-# libraries at the same time...
-#
-CFLAGS="$RPM_OPT_FLAGS $ARCH_CFLAGS" \
-./configure \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir} \
- --disable-shared \
- --enable-static \
- --disable-aload \
- --disable-alisp
-make %{?jobs:-j %jobs}
-# install it to save
-make DESTDIR=$ALSA_ROOT install
-#
-# ok, then clean up and rebuild the shared library
-#
-make clean
CFLAGS="$RPM_OPT_FLAGS $ARCH_CFLAGS" \
./configure \
--libdir=%{_libdir} \
@@ -152,127 +131,50 @@
--datadir=%{_datadir} \
--enable-shared \
--disable-static \
+ --enable-symbolic-functoins \
--disable-aload \
--disable-alisp
make %{?jobs:-j %jobs}
-#
# run doxygen
-#
make -C doc doc
-cd ..
-#
-# build alsa-utils
-#
-cd alsa-utils*/.
-ACLOCAL="aclocal -I $ALSA_ROOT_ACLOCAL" autoreconf -fi
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
- --prefix=%{_prefix} \
- --with-alsa-prefix=$ALSA_ROOT_LIB \
- --with-alsa-inc-prefix=$ALSA_ROOT_INC \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir} \
- --with-curses=ncursesw
-make %{?jobs:-j %jobs}
-cd ..
-#
-# build alsa-oss
-#
-cd alsa-oss*/.
-ACLOCAL="aclocal -I $ALSA_ROOT_ACLOCAL" autoreconf -fi
-export LD_LIBRARY_PATH=$ALSA_ROOT_LIB
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
- --prefix=%{_prefix} \
- --with-alsa-inc-prefix=$ALSA_ROOT_INC \
- --disable-alsatest \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir}
-make %{?jobs:-j %jobs}
-cd ..
%install
-ALSA_ROOT=`pwd`
-ALSA_ROOT_LIB=$ALSA_ROOT/alsa-lib-%{package_version}/src/.libs
-export LD_LIBRARY_PATH=$ALSA_ROOT_LIB
-# Create directories:
-# (/usr/lib for fixed all_notes_off data, %_libdir for libs)
-for I in %{_bindir} \
- %{_libdir} \
- /usr/lib \
- %{_sbindir} \
- /etc/init.d \
- %{_datadir}/sounds/alsa \
- /etc/udev/rules.d \
- /etc/alsa.d \
- %{_datadir}/alsa \
- %{_docdir}/%{name}
-do
- install -m 755 -d $RPM_BUILD_ROOT$I
-done
-make -C alsa-lib*/. DESTDIR=$RPM_BUILD_ROOT install
-find $ALSA_ROOT%{_libdir} -name "*.a" -printf "%{_libdir}/%%P\n" |
- while read L; do cp $ALSA_ROOT$L $RPM_BUILD_ROOT$L; done
-rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.la
-make -C alsa-utils*/. DESTDIR=$RPM_BUILD_ROOT install
-make -C alsa-oss*/. DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libaoss.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libaoss.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libalsatoss.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libalsatoss.la
-#
-# install alsa-lib documents
-#
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
-cd alsa-lib*/.
-cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
-cp doc/asoundrc.txt $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
-cd ..
-#
-# install alsa-utils documents
-#
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils
-cd alsa-utils*/.
-cp COPYING ChangeLog INSTALL README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils/alsamixer
-cp alsamixer/README $RPM_BUILD_ROOT/%{_docdir}/%{name}/alsa-utils/alsamixer
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils/aconnect
-cp seq/aconnect/README* $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils/aconnect
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}/alsa-utils/aseqnet
-cp seq/aseqnet/README* $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-utils/aseqnet
-cd ..
-#
-# install documents by suse
-#
-cp %{SOURCE20} $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp %{SOURCE21} $RPM_BUILD_ROOT%{_docdir}/%{name}
-#
-# install set_default_volume script
+# install shared library
+make DESTDIR=$RPM_BUILD_ROOT install
+# clean up unneeded files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.*a
+rm -f $RPM_BUILD_ROOT%{_bindir}/aserver
#
+# install helper scripts
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
-#
# install test wave file
-#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav
-#
# install all_notes_off stuff
-#
install -c -m 0755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/usr/lib
install -c -m 0644 %{SOURCE31} $RPM_BUILD_ROOT/usr/lib
install -c -m 0644 %{SOURCE32} $RPM_BUILD_ROOT/usr/lib
#
-# install alsasound and joystick scripts
+# install init scripts
#
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick
ln -s ../../etc/init.d/joystick $RPM_BUILD_ROOT%{_sbindir}/rcjoystick
+#
# udev rules
+#
+mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
install -c -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/etc/udev/rules.d
-# install helper scripts
+# install udev-helper scripts
+mkdir -p $RPM_BUILD_ROOT/etc/alsa.d
install -c -m 0744 %{SOURCE6} $RPM_BUILD_ROOT/etc/alsa.d
install -c -m 0744 %{SOURCE7} $RPM_BUILD_ROOT/etc/alsa.d
#
@@ -284,10 +186,16 @@
for i in sound joystick; do
install -m 644 $RPM_SOURCE_DIR/sysconfig.$i $RPM_BUILD_ROOT/var/adm/fillup-templates
done
+#
+# documents
+#
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp $RPM_SOURCE_DIR/README* $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
+cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
+cp doc/asoundrc.txt $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib
%post
-%run_ldconfig
-%ifnarch sparc sparc64
%{rename_sysconfig_variable START_ALSA_SEQ LOAD_SEQUENCER}
# fixed obsolete (wrong) variable.
if [ -f /etc/sysconfig/sound ]; then
@@ -310,66 +218,60 @@
fi
fi
fi
-%endif
exit 0
%preun
-%ifnarch sparc sparc64
%stop_on_removal alsasound joystick
-%endif
exit 0
%postun
-%run_ldconfig
-%ifnarch sparc sparc64
%restart_on_update alsasound joystick
-%insserv_cleanup
-%endif
exit 0
+%post -n libasound2
+%run_ldconfig
+
+%postun -n libasound2
+%run_ldconfig
+
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc %{_docdir}/%{name}
-%{_libdir}/libasound.so.*
-# .so must be in the main package because aoss requires it
-%{_libdir}/libaoss.so*
-# .so must be in the main package because oss-redir requires it
-%{_libdir}/libalsatoss.so*
-%{_libdir}/alsa-lib
-%ifnarch sparc sparc64
-%{_datadir}/sounds/alsa
/etc/init.d/*
%{_sbindir}/*
%{_bindir}/*
/usr/lib/all_notes_off.*
-%{_datadir}/alsa
-%{_datadir}/locale/*/*/*
+%{_datadir}/sounds/alsa
/var/adm/fillup-templates/*
/etc/udev
/etc/alsa.d
-%doc %{_mandir}/man*/*
-%doc %{_mandir}/fr
-%endif
%files devel
%defattr(-, root, root)
%{_libdir}/libasound.so
-%{_libdir}/libasound.*a
-%{_libdir}/libossredir.*a
%{_includedir}/sys/*
%{_includedir}/alsa
-%{_includedir}/oss-redir.h
%{_datadir}/aclocal/*.m4
%{_libdir}/pkgconfig/*.pc
%files docs
%defattr(-, root, root)
-%doc alsa-lib*/doc/doxygen/html/*
+%doc doc/doxygen/html/*
+
+%files -n libasound2
+%defattr(-, root, root)
+%{_libdir}/libasound.so.*
+%{_libdir}/alsa-lib
+%{_datadir}/alsa
%changelog
+* Mon Apr 16 2007 - tiwai@suse.de
+- split library files to libasound2 sub package
+- split alsa-utils and alsa-oss to own sub packages
+- remove static library and unneeded files
* Tue Apr 10 2007 - tiwai@suse.de
- update alsa-lib & utils 20070410 snapshot
* add missing smixer.conf file
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org