Attachment 300372 Details for Bug 440559 – Patch to fix multilib conflict

[patch] Patch to fix multilib conflict

alsa-lib-multilib.patch (text/plain), 2.46 KB, created by Jim Radford on 2008-04-04 01:17:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Radford

Created: 2008-04-04 01:17:02 UTC

Size: 2.46 KB

patch

obsolete

>Index: alsa-lib-1.0.16-no-dox-date.patch
>===================================================================
>RCS file: alsa-lib-1.0.16-no-dox-date.patch
>diff -N alsa-lib-1.0.16-no-dox-date.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ alsa-lib-1.0.16-no-dox-date.patch	4 Apr 2008 01:11:26 -0000
>@@ -0,0 +1,17 @@
>+--- alsa-lib-1.0.16/doc/no_date_footer.html	1969-12-31 16:00:00.000000000 -0800
>++++ alsa-lib-1.0.16-dox/doc/no_date_footer.html	2008-04-03 17:52:52.000000000 -0700
>+@@ -0,0 +1,6 @@
>++<hr size="1"><address style="text-align: right;"><small>
>++Generated for $projectname by&nbsp;<a href="http://www.doxygen.org/
>++index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
>++$doxygenversion</small></address>
>++</body>
>++</html>
>+--- alsa-lib-1.0.16/doc/doxygen.cfg	2008-02-05 01:23:44.000000000 -0800
>++++ alsa-lib-1.0.16-dox/doc/doxygen.cfg	2008-04-03 17:58:01.000000000 -0700
>+@@ -117,3 +117,5 @@
>+ 
>+ #INPUT_FILTER	 = inputfilter
>+ #FILTER_SOURCE_FILES = YES
>++
>++HTML_FOOTER      = no_date_footer.html
>Index: alsa-lib.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
>retrieving revision 1.66
>diff -p -u -u -r1.66 alsa-lib.spec
>--- alsa-lib.spec	20 Feb 2008 03:30:26 -0000	1.66
>+++ alsa-lib.spec	4 Apr 2008 01:11:26 -0000
>@@ -4,13 +4,14 @@
> Summary: The Advanced Linux Sound Architecture (ALSA) library
> Name:    alsa-lib
> Version: 1.0.16
>-Release: 2%{?prever_dot}%{?dist}
>+Release: 3%{?prever_dot}%{?dist}
> License: LGPLv2+
> Group:   System Environment/Libraries
> Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
> Patch0:  alsa-lib-1.0.14rc1-config.patch
> Patch2:  alsa-lib-1.0.14-glibc-open.patch
> Patch3:	 alsa-lib-pulse-default.patch
>+Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
> URL:     http://www.alsa-project.org/
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: doxygen
>@@ -42,6 +43,7 @@ against the ALSA libraries and interface
> %patch0 -p1 -b .config
> %patch2 -p1 -b .glibc-open
> %patch3 -p1 -b .pulse-default
>+%patch4 -p1 -b .no-dox-date
> 
> %build
> %configure --with-configdir=%{_sysconfdir}/alsa
>@@ -89,6 +91,9 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
> %{_datadir}/aclocal/alsa.m4
> 
> %changelog
>+* Thu Apr  3 2008 Jim Radford <radford@blackbean.org> - 1.0.16-3
>+- Fix multilib doxygen conflicts
>+
> * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.16-2
> - Autorebuild for GCC 4.3
>

Actions: View | Diff

Attachments on bug 440559: 300372