From f4602f52a4874b74144eb122980dc6b8fa4e0c8a Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Wed, 31 Dec 2008 07:50:54 +0000
Subject: [PATCH] - Multilib fixes (bugs #342291, #477291)

---
 liboggz-0.9.8-multilib.patch | 11 ++++++
 liboggz.spec                 | 68 ++++++++++++++++++++++++++++--------
 2 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 liboggz-0.9.8-multilib.patch

diff --git a/liboggz-0.9.8-multilib.patch b/liboggz-0.9.8-multilib.patch
new file mode 100644
index 0000000..d7825c0
--- /dev/null
+++ b/liboggz-0.9.8-multilib.patch
@@ -0,0 +1,11 @@
+--- liboggz-0.9.8/include/oggz/oggz_off_t_generated.h.in.multilib	2008-04-06 00:45:38.000000000 -0400
++++ liboggz-0.9.8/include/oggz/oggz_off_t_generated.h.in	2008-12-31 02:09:03.000000000 -0500
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-typedef @TYPEOF_OGGZ_OFF_T@ oggz_off_t;
++typedef loff_t oggz_off_t;
+ 
+ #define PRI_OGGZ_OFF_T "@PRI_OGGZ_OFF_T@"
+ 
diff --git a/liboggz.spec b/liboggz.spec
index 9b0d46e..67031a7 100644
--- a/liboggz.spec
+++ b/liboggz.spec
@@ -1,12 +1,14 @@
 Name:           liboggz
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.annodex.net/
-Source:         http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
+Source0:        http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
+# Always have oggz_off_t == loff_t even on 64-bit platforms
+Patch0:		liboggz-0.9.8-multilib.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel >= 1.0
@@ -14,47 +16,80 @@ BuildRequires:  doxygen
 BuildRequires:  docbook-utils
 
 %description
-Oggz provides a simple programming interface for reading and writing Ogg files
-and streams. Ogg is an interleaving data container developed by Monty at
-Xiph.Org, originally to support the Ogg Vorbis audio format.
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
 
 %package devel
 Summary:	Files needed for development using liboggz
 Group:          Development/Libraries
-Requires:       liboggz = %{version}
+Requires:       liboggz = %{version}-%{release}
 Requires:       libogg-devel >= 1.0
 Requires:       pkgconfig
 
 %description devel
-Oggz provides a simple programming interface for reading and writing Ogg files
-and streams. Ogg is an interleaving data container developed by Monty at
-Xiph.Org, originally to support the Ogg Vorbis audio format.
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
 
 This package contains the header files and documentation needed for
 development using liboggz.
 
+%package doc
+Summary:        Documentation for liboggz
+Group:		Documentation
+Requires:	liboggz = %{version}-%{release}
+
+%description doc
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
+
+This package contains HTML documentation needed for development using
+liboggz.
+
+
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .multilib
 
 %build
 %configure
-make
+make %{?_smp_mflags}
+
 
 %check
 make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}
+%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version} \
+	     INSTALL="%{__install} -p"
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # not particularly interested in the tex docs, the html version has everything
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}/latex
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version}/latex
+
+# Multilib fix: ensure generated headers have timestamps
+# independent of build time
+(cd include/oggz &&
+    touch -r oggz_off_t_generated.h.in.multilib \
+      $RPM_BUILD_ROOT%{_includedir}/oggz/oggz_off_t_generated.h
+)
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
                                                                                 
 %files
 %defattr(-,root,root)
@@ -71,13 +106,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liboggz.so
 %{_libdir}/liboggz.a
 %{_libdir}/pkgconfig/oggz.pc
-%doc %{_docdir}/%{name}-devel-%{version}
 
-%post -p /sbin/ldconfig
+%files doc
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-doc-%{version}
 
-%postun -p /sbin/ldconfig
 
 %changelog
+* Tue Dec 30 2008 Michel Salim <salimma@fedoraproject.org> - 0.9.8-2
+- Multilib fixes (bugs #342291, #477291)
+
 * Mon Jul  7 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.9.8-1
 - Update to 0.9.8