Hello community,
here is the log from the commit of package esound
checked in at Sat Aug 2 03:26:21 CEST 2008.
--------
--- GNOME/esound/esound.changes 2008-06-18 15:42:20.000000000 +0200
+++ esound/esound.changes 2008-07-30 16:59:36.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jul 30 16:50:19 CEST 2008 - sbrabec@suse.cz
+
+- Fixed package splitting (bnc#412459).
+- Splitted esound to esound-daemon and esound-utils.
+- Improved packaging of esddsp (bgo#545534).
+
+-------------------------------------------------------------------
New:
----
esound-esddsp-no-version-info.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ esound.spec ++++++
--- /var/tmp/diff_new_pack.jC5865/_old 2008-08-02 03:19:48.000000000 +0200
+++ /var/tmp/diff_new_pack.jC5865/_new 2008-08-02 03:19:48.000000000 +0200
@@ -18,19 +18,21 @@
AutoReqProv: on
Summary: A sound daemon for Enlightenment and GNOME
Version: 0.2.38
-Release: 77
+Release: 85
Url: ftp://ftp.gnome.org/pub/gnome/sources/esound/
Source: ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/%{name}-%{version}.tar.bz2
Source1: esound.init
Source2: sysconfig.esound
Patch0: esd-as.patch
+# PATCH-FIX-UPSTREAM esound-biarch.patch bgo545534 sbrabec@suse.cz -- fix bi-arch clash
Patch1: esound-biarch.patch
# PATCH-FIX-UPSTREAM suppress verbose error messages from alsa-lib bnc300031 bgo528718
Patch2: esound-suppress-alsa-debug.diff
# PATCH-FIX-UPSTREAM esound-multi-user-375701.patch -- Fedora patch to allow better multi user access
Patch3: esound-multi-user-375701.patch
Patch4: esound-configure.patch
-PreReq: %insserv_prereq %fillup_prereq
+# PATCH-FIX-UPSTREAM esound-esddsp-no-version-info.patch bgo545534 sbrabec@suse.cz -- move non-standard library to a separate directory
+Patch5: esound-esddsp-no-version-info.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -57,8 +59,8 @@
%package -n libesd0
License: LGPL v2.0 or later
Summary: A sound daemon for Enlightenment and GNOME
-Group: System/Sound Daemons
-PreReq: coreutils sed grep /usr/bin/cmp fillup
+Group: System/Libraries
+Requires: %{name}-daemon >= %{version}
%description -n libesd0
A multiplexing and caching sound daemon. It can use ALSA or OSS for
@@ -81,6 +83,62 @@
Timur Bakeyev
Yo Ric Dude
+%package daemon
+License: LGPL v2.0 or later
+Summary: A sound daemon for Enlightenment and GNOME
+Group: System/Sound Daemons
+PreReq: %insserv_prereq %fillup_prereq
+Obsoletes: esound
+
+%description daemon
+A multiplexing and caching sound daemon. It can use ALSA or OSS for
+sound output. Many projects, including Enlightenment and GNOME, use
+esound to play and record their sounds.
+
+
+
+Authors:
+--------
+ Carsten Haitzler
+ Drazen Kacar
+ Elliot Lee
+ John Ellis
+ Kjartan Maraas
+ Raja R Harinath
+ Richard Boulton
+ Russell Steinthal
+ Scott Heavner
+ Timur Bakeyev
+ Yo Ric Dude
+
+%package utils
+License: LGPL v2.0 or later
+Summary: A sound daemon for Enlightenment and GNOME
+Group: Productivity/Multimedia/Sound/Utilities
+# For update from <= 11.0 and SLE <= 10
+Provides: esound:%{_bindir}/esddsp
+
+%description utils
+A multiplexing and caching sound daemon. It can use ALSA or OSS for
+sound output. Many projects, including Enlightenment and GNOME, use
+esound to play and record their sounds.
+
+
+
+Authors:
+--------
+ Carsten Haitzler
+ Drazen Kacar
+ Elliot Lee
+ John Ellis
+ Kjartan Maraas
+ Raja R Harinath
+ Richard Boulton
+ Russell Steinthal
+ Scott Heavner
+ Timur Bakeyev
+ Yo Ric Dude
+
%package -n libesd-devel
License: LGPL v2.0 or later
Summary: EsounD development package
@@ -88,7 +146,7 @@
# replaces esound-devel
Provides: esound-devel = %{version}
Obsoletes: esound-devel <= %{version}
-Requires: libesd0 = %{version} alsa-devel %(rpm -q --queryformat '%{NAME}' -f %_libdir/pkgconfig/audiofile.pc)
+Requires: libesd0 = %{version} alsa-devel %(rpm -q --queryformat '%{NAME}' -f %{_libdir}/pkgconfig/audiofile.pc)
%description -n libesd-devel
EsounD development package.
@@ -116,54 +174,62 @@
%patch2
%patch3 -p1
%patch4
+%patch5
%build
autoreconf -f -i
%configure\
+ --disable-static\
--with-libwrap\
--enable-ipv6
make %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/esound
-chmod +x $RPM_BUILD_ROOT/etc/init.d/esound
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -s ../../etc/init.d/esound $RPM_BUILD_ROOT/usr/sbin/rcesound
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/esound
+chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/esound
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -s ../..%{_sysconfdir}/init.d/esound $RPM_BUILD_ROOT%{_sbindir}/rcesound
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.*a
%post -n libesd0 -p /sbin/ldconfig
%postun -n libesd0 -p /sbin/ldconfig
-%post
+%post daemon
%{fillup_and_insserv}
-%postun
+%postun daemon
%{insserv_cleanup}
-%preun
+%preun daemon
%{stop_on_removal}
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -n libesd0
+%defattr(-, root, root)
+%{_libdir}/*.so.*
+
+%files daemon
%defattr(-, root, root)
%doc README AUTHORS COPYING.LIB NEWS TODO TIPS MAINTAINERS
-%config %{_sysconfdir}/esd.conf
%{_bindir}/esd
-%{_bindir}/esd[a-z]*
-%doc %{_mandir}/man1/esd[a-z.]*.*
-%config /etc/init.d/*
-/usr/sbin/*
-/var/adm/fillup-templates/*
+%{_localstatedir}/adm/fillup-templates/*
+%doc %{_mandir}/man1/esd.*
+%{_sbindir}/*
+%config %{_sysconfdir}/esd.conf
+%{_sysconfdir}/init.d/*
-%files -n libesd0
+%files utils
%defattr(-, root, root)
-%{_libdir}/*.so.*
+%{_bindir}/esd[a-z]*
+%doc %{_mandir}/man1/esd[a-z]*.*
+%{_libdir}/%{name}
%files -n libesd-devel
%defattr(-, root, root)
@@ -176,6 +242,10 @@
%doc %{_mandir}/man1/esd-config.*
%changelog
+* Wed Jul 30 2008 sbrabec@suse.cz
+- Fixed package splitting (bnc#412459).
+- Splitted esound to esound-daemon and esound-utils.
+- Improved packaging of esddsp (bgo#545534).
* Wed Jun 18 2008 schwab@suse.de
- Fix configure script.
* Mon May 12 2008 rodrigo@suse.de
++++++ esound-esddsp-no-version-info.patch ++++++
--- Makefile.am
+++ Makefile.am
@@ -10,7 +10,8 @@
if BUILD_ESDDSP
ESDDSP = esddsp
-libesddsp_la = libesddsp.la
+libesddspdir = $(libdir)/$(PACKAGE)
+libesddsp_LTLIBRARIES = libesddsp.la
endif
if BUILD_ESDPLAY
ESDPLAY = esdplay
@@ -26,7 +27,7 @@
$(ESDDSP) \
esd-config
-lib_LTLIBRARIES = libesd.la $(libesddsp_la)
+lib_LTLIBRARIES = libesd.la
libesd_la_CFLAGS = $(AM_CFLAGS)
libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined
@@ -60,7 +61,7 @@
audio_solaris.c \
audio_win32.c
-libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
+libesddsp_la_LDFLAGS = -module -avoid-version
libesddsp_la_LIBADD = $(DL_LIB) -lm libesd.la
libesddsp_la_SOURCES = \
--- esddsp.in
+++ esddsp.in
@@ -106,7 +106,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-LD_PRELOAD="${exec_prefix}/\$LIB/libesddsp.so.@ESD_MAJOR_VERSION@ ${exec_prefix}/\$LIB/libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
+LD_PRELOAD="${exec_prefix}/\$LIB/@PACKAGE@/libesddsp.so ${exec_prefix}/\$LIB/libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
export LD_PRELOAD
# invoke the program with the args given
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org