Attachment 631502 Details for Bug 866794 – spec file patch

spec file patch

esound.patch (text/plain), 4.09 KB, created by Terje Røsten on 2012-10-22 13:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Terje Røsten

Created: 2012-10-22 13:21:39 UTC

Size: 4.09 KB

patch

obsolete

>commit eb9dea5887a3e393b445bfe72175525ee116bdca
>Author: Terje Røsten <terje.rosten@ntnu.no>
>Date:   Mon Oct 22 15:18:14 2012 +0200
>
>    Rebuild for new audiofile
>
>diff --git a/esound-0.2.41-dso.patch b/esound-0.2.41-dso.patch
>new file mode 100644
>index 0000000..0b2b5eb
>--- /dev/null
>+++ b/esound-0.2.41-dso.patch
>@@ -0,0 +1,26 @@
>+diff --git a/Makefile.am b/Makefile.am
>+index 08c4c94..1bcedcf 100644
>+--- a/Makefile.am
>++++ b/Makefile.am
>+@@ -125,7 +125,7 @@ esdplay_SOURCES = \
>+ 
>+ LDADD = libesd.la $(AUDIOFILE_LIBS)
>+ 
>+-esd_LDADD = $(WRAP_LIB) $(LDADD)
>++esd_LDADD = $(WRAP_LIB) $(LDADD) -lm
>+ 
>+ m4datadir = $(datadir)/aclocal
>+ m4data_DATA = esd.m4
>+diff --git a/Makefile.in b/Makefile.in
>+index 92df5b8..faa6f58 100644
>+--- a/Makefile.in
>++++ b/Makefile.in
>+@@ -420,7 +420,7 @@ esdplay_SOURCES = \
>+ 	$(getopt_src) \
>+ 	esdplay.c
>+ 
>+-LDADD = libesd.la $(AUDIOFILE_LIBS)
>++LDADD = libesd.la $(AUDIOFILE_LIBS) -lm
>+ esd_LDADD = $(WRAP_LIB) $(LDADD)
>+ m4datadir = $(datadir)/aclocal
>+ m4data_DATA = esd.m4
>diff --git a/esound.spec b/esound.spec
>index 0b869e3..d7148a0 100644
>--- a/esound.spec
>+++ b/esound.spec
>@@ -1,19 +1,18 @@
>-# Note that this is NOT a relocatable package
> Summary: Allows several audio streams to play on a single audio device
> Name:    esound
> Version: 0.2.41
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> Epoch:   1
> License: LGPLv2+
> URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
> Group: System Environment/Daemons
> Source0:  http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2
>-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-Patch4: esound-0.2.38-drain.patch
>-Patch6: esound-0.2.38-fix-open-macro.patch
>-Patch7: remove-confusing-spew.patch
>+Patch0: esound-0.2.38-drain.patch
>+Patch1: esound-0.2.38-fix-open-macro.patch
>+Patch2: remove-confusing-spew.patch
> # default to nospawn, so we can kill the esd.conf file
>-Patch8: esound-nospawn.patch
>+Patch3: esound-nospawn.patch
>+Patch4: esound-0.2.41-dso.patch
> # temporarily disable doc build due to xml catalog issues
> #BuildRequires: docbook-utils
> BuildRequires: audiofile-devel
>@@ -64,19 +63,20 @@ other resources needed to develop EsounD applications.
> %prep
> %setup -q
> 
>-%patch4 -p1 -b .drain-race
>-%patch6 -p1 -b .open-macro
>-%patch7 -p1 -b .spew
>-%patch8 -p1 -b .nospawn
>+%patch0 -p1 -b .drain-race
>+%patch1 -p1 -b .open-macro
>+%patch2 -p1 -b .spew
>+%patch3 -p1 -b .nospawn
>+%patch4 -p1 -b .dso
> 
> %build
> %configure --disable-static
> 
>-EGREP=egrep make
>+EGREP=egrep make %{?_smp_mflags}
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-%makeinstall
>+make DESTDIR="$RPM_BUILD_ROOT" install
> 
> rm -f $RPM_BUILD_ROOT%{_sysconfdir}/esd.conf
> rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
>@@ -87,13 +87,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/esd $RPM_BUILD_ROOT%{_mandir}/man1/esd.1*
> 
> %postun libs -p /sbin/ldconfig
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> %files libs
> %doc AUTHORS COPYING.LIB ChangeLog docs/esound.sgml
> %doc NEWS README TIPS TODO
>-%defattr(-, root, root,-)
> %{_libdir}/*.so.*
> 
> %files tools
>@@ -119,7 +115,6 @@ rm -rf $RPM_BUILD_ROOT
> #%doc %{_datadir}/doc/esound
> 
> %files devel
>-%defattr(-, root, root,-)
> %{_bindir}/esd-config
> %{_includedir}/*
> %{_datadir}/aclocal/*
>@@ -128,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man1/esd-config.1.gz
> 
> %changelog
>+* Mon Oct 22 2012 Terje Rosten <terje.rosten@ntnu.no> - 1:0.2.41-7
>+- Add patch to build in rawhide
>+- Random spec cleanup
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.2.41-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>@@ -349,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT
> - automatic rebuild
> 
> * Mon Jul 10 2000 Elliot Lee <sopwith@redhat.com> 0.2.18-4
>-- Pass a prefix of /usr to configure, NOT %prefix
>+- Pass a prefix of /usr to configure, NOT %%prefix
> 
> * Thu Jun 29 2000 Dave Mason <dcm@redhat.com> 0.2.18-3
> - fixed Doc Dir
>@@ -366,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> * Sat Nov 21 1998 Pablo Saratxaga <srtxg@chanae.alphanet.ch>
> 
>-- added /usr/share/aclocal/* to %files devel
>+- added /usr/share/aclocal/* to %%files devel
> - added spanish and french translations for rpm
> 
> * Thu Oct 1 1998 Ricdude <ericmit@ix.netcom.com>

Actions: View

Attachments on bug 866794: 631502