From bf5048dff67dec363408ba1ee081c11ff3b69f36 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Jun 13 2012 01:39:32 +0000
Subject: Re-fix multilib confict RHBZ#528240


- Some specfile clean up

---

diff --git a/fluidsynth-no_date_footer.patch b/fluidsynth-no_date_footer.patch
new file mode 100644
index 0000000..523c187
--- /dev/null
+++ b/fluidsynth-no_date_footer.patch
@@ -0,0 +1,34 @@
+diff -rupN fluidsynth-1.1.5.old/doc/Doxyfile fluidsynth-1.1.5/doc/Doxyfile
+--- fluidsynth-1.1.5.old/doc/Doxyfile	2011-09-04 03:38:58.000000000 -0400
++++ fluidsynth-1.1.5/doc/Doxyfile	2012-06-12 20:35:34.345619002 -0400
+@@ -134,7 +134,7 @@ GENERATE_HTML          = YES
+ HTML_OUTPUT            = html
+ HTML_FILE_EXTENSION    = .html
+ HTML_HEADER            = 
+-HTML_FOOTER            = 
++HTML_FOOTER            = no_date_footer.html
+ HTML_STYLESHEET        = 
+ HTML_ALIGN_MEMBERS     = YES
+ GENERATE_HTMLHELP      = NO
+diff -rupN fluidsynth-1.1.5.old/doc/Doxyfile.cmake fluidsynth-1.1.5/doc/Doxyfile.cmake
+--- fluidsynth-1.1.5.old/doc/Doxyfile.cmake	2011-09-04 03:38:58.000000000 -0400
++++ fluidsynth-1.1.5/doc/Doxyfile.cmake	2012-06-12 20:55:24.288334928 -0400
+@@ -121,7 +121,7 @@ GENERATE_HTML = YES
+ HTML_OUTPUT = html
+ HTML_FILE_EXTENSION = .html
+ HTML_HEADER = 
+-HTML_FOOTER = 
++HTML_FOOTER = @CMAKE_SOURCE_DIR@/doc/no_date_footer.html
+ HTML_STYLESHEET = 
+ HTML_ALIGN_MEMBERS = YES
+ GENERATE_HTMLHELP = NO
+diff -rupN fluidsynth-1.1.5.old/doc/no_date_footer.html fluidsynth-1.1.5/doc/no_date_footer.html
+--- fluidsynth-1.1.5.old/doc/no_date_footer.html	1969-12-31 19:00:00.000000000 -0500
++++ fluidsynth-1.1.5/doc/no_date_footer.html	2012-06-12 20:36:05.628479193 -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 --git a/fluidsynth.spec b/fluidsynth.spec
index 1449ed6..b12f4e6 100644
--- a/fluidsynth.spec
+++ b/fluidsynth.spec
@@ -1,17 +1,18 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.1.5
-Release:      3%{?dist}
+Release:      4%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://downloads.sourceforge.net/fluidsynth/fluidsynth-%{version}.tar.bz2
 License:      LGPLv2+
 Group:        Applications/Multimedia
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:     fluidsynth-libs = %{version}-%{release}
+Requires:     fluidsynth-libs%{?_isa} = %{version}-%{release}
 
 # Fix cmake usage. Upstream informed on their mailing list
 # https://lists.nongnu.org/archive/html/fluid-dev/2011-08/msg00010.html
 Patch0:       fluidsynth-fix-cmake-usage.patch
+# Re-fix multi-lib conflict RHBZ#528240
+Patch1:       fluidsynth-no_date_footer.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
@@ -53,8 +54,7 @@ shared libraries.
 %package devel
 Summary:   Real-time software synthesizer development files
 Group:     Development/Libraries
-Requires:  fluidsynth-libs = %{version}-%{release}
-Requires:  pkgconfig
+Requires:  fluidsynth-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 FluidSynth is a real-time software synthesizer based on the SoundFont 2 
@@ -64,7 +64,7 @@ for building programs that link against fluidsynth.
 %prep
 %setup -q
 %patch0 -p1 -b .cmake.usage
-
+%patch1 -p1 -b .no.date
 
 %build
 mkdir -p %{_target_platform}
@@ -80,33 +80,26 @@ make doxygen -C %{_target_platform}/doc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/fluid*
 %{_mandir}/man1/fluidsynth*
 
 %files libs
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO doc/FluidSynth-LADSPA.pdf
+%doc AUTHORS COPYING NEWS README THANKS TODO doc/FluidSynth-LADSPA.pdf
 %{_libdir}/libfluidsynth.so.1
 %{_libdir}/libfluidsynth.so.1.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc %{_target_platform}/doc/api/html doc/*.c doc/*fluid*.txt
+%doc %{_target_platform}/doc/api/html doc/*.c doc/*fluid*.txt doc/*.odt
+%doc ChangeLog
 %{_includedir}/fluidsynth.h
 %{_includedir}/fluidsynth/
 %{_libdir}/libfluidsynth.so
@@ -114,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 12 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.1.5-4
+- Re-fix multilib confict RHBZ#528240
+- Some specfile clean up
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild