[libffado] Fix multilib confict RHBZ#831405
Orcan Ogetbil
oget at fedoraproject.org
Wed Jun 13 01:30:42 UTC 2012
commit 423a2685b24c2dfb9a819d6f5ee079b527dd65a5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Tue Jun 12 21:30:35 2012 -0400
Fix multilib confict RHBZ#831405
- Fix DSO linking #ticket 355
libffado-dso-linking.patch | 12 ++++++++++++
libffado-no_date_footer.patch | 22 ++++++++++++++++++++++
libffado.spec | 17 ++++++++++++++---
3 files changed, 48 insertions(+), 3 deletions(-)
---
diff --git a/libffado-dso-linking.patch b/libffado-dso-linking.patch
new file mode 100644
index 0000000..26574eb
--- /dev/null
+++ b/libffado-dso-linking.patch
@@ -0,0 +1,12 @@
+diff -rupN libffado-2.1.0.old/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
+--- libffado-2.1.0.old/support/dbus/SConscript 2011-02-02 17:51:32.000000000 -0500
++++ libffado-2.1.0/support/dbus/SConscript 2012-06-12 20:53:36.173805796 -0400
+@@ -34,7 +34,7 @@ env = env.Clone()
+
+ env.AppendUnique( CPPPATH=["#/", "#/src"] )
+ env.PrependUnique( LIBPATH=[env['build_base']+"src"] )
+-env.PrependUnique( LIBS=["ffado"] )
++env.PrependUnique( LIBS=["ffado", "pthread"] )
+
+ if not env.GetOption( "clean" ):
+ env.MergeFlags( env["DBUS1_FLAGS"] )
diff --git a/libffado-no_date_footer.patch b/libffado-no_date_footer.patch
new file mode 100644
index 0000000..bb2938d
--- /dev/null
+++ b/libffado-no_date_footer.patch
@@ -0,0 +1,22 @@
+diff -rupN libffado-2.1.0.old/doc/no_date_footer.html libffado-2.1.0/doc/no_date_footer.html
+--- libffado-2.1.0.old/doc/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500
++++ libffado-2.1.0/doc/no_date_footer.html 2012-06-12 20:02:34.047382587 -0400
+@@ -0,0 +1,6 @@
++<hr size="1"><address style="text-align: right;"><small>
++Generated for $projectname by <a href="http://www.doxygen.org/
++index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
++$doxygenversion</small></address>
++</body>
++</html>
+diff -rupN libffado-2.1.0.old/doc/reference.doxygen.in libffado-2.1.0/doc/reference.doxygen.in
+--- libffado-2.1.0.old/doc/reference.doxygen.in 2009-12-18 13:52:13.000000000 -0500
++++ libffado-2.1.0/doc/reference.doxygen.in 2012-06-12 20:01:46.355591137 -0400
+@@ -790,7 +790,7 @@ HTML_HEADER =
+ # each generated HTML page. If it is left blank doxygen will generate a
+ # standard footer.
+
+-HTML_FOOTER =
++HTML_FOOTER = no_date_footer.html
+
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+ # style sheet that is used by each HTML page. It can be used to
diff --git a/libffado.spec b/libffado.spec
index 3b1de9d..5d212dd 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -5,7 +5,7 @@
Summary: Free firewire audio driver library
Name: libffado
Version: 2.1.0
-Release: 0.8.20120325.svn2088%{?dist}
+Release: 0.9.20120325.svn2088%{?dist}
# src/libutil/float_cast.h is LGPLv2+.
# The rest is (GPLv2 or GPLv3)
License: LGPLv2+ and (GPLv2 or GPLv3)
@@ -21,6 +21,11 @@ Source9: libffado-snapshot.sh
# We want the documentation for the library API only, not for the entire source:
# http://subversion.ffado.org/ticket/293
Patch0: libffado-api-doc-only.patch
+# Remove dates from doc footers to prevent multilib conflict PHBZ#831405
+Patch1: libffado-no_date_footer.patch
+# Fix DSO linking
+# http://subversion.ffado.org/ticket/355
+Patch2: libffado-dso-linking.patch
BuildRequires: alsa-lib-devel
BuildRequires: dbus-c++-devel
BuildRequires: dbus-devel
@@ -49,7 +54,7 @@ successor of the FreeBoB project.
Summary: Free firewire audio driver library development headers
Group: Development/Libraries
License: GPLv2 or GPLv3
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -62,7 +67,7 @@ Group: Applications/Multimedia
# Some files in support/mixer-qt4/ffado are GPLv3+
# The rest is GPLv2 or GPLv3
License: GPLv3 and GPLv3+ and (GPLv2 or GPLv3)
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: dbus
Requires: dbus-python
Requires: PyQt4
@@ -74,6 +79,8 @@ Applications and utilities for use with libffado.
%prep
%setup -q
%patch0 -p1 -b .api.doc.only
+%patch1 -p1 -b .no.date
+%patch2 -p1 -b .dso.linking
cp -a %{SOURCE1} .
@@ -144,6 +151,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{python_sitelib}/ffado/
%changelog
+* Tue Jun 12 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.1.0-0.9.20120325.svn2088
+- Fix multilib confict RHBZ#831405
+- Fix DSO linking #ticket 355
+
* Sun Mar 25 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.1.0-0.8.20120325.svn2088
- Update to svn2088.
- Drop upstreamed gcc-4.7 patch.
More information about the scm-commits
mailing list