From 25f698083cc381c3449ddaca8070ac8d85dd77a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 23 Aug 2005 16:10:13 +0000
Subject: [PATCH] - Don't ship static libs. 0.7-3 - Fix x86_64, thanks to Adam
 Goode (#166127).

---
 libmodplug-64bit.patch | 37 +++++++++++++++++++++++++++++++++++++
 libmodplug.spec        | 28 ++++++++++++++++++----------
 2 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 libmodplug-64bit.patch

diff --git a/libmodplug-64bit.patch b/libmodplug-64bit.patch
new file mode 100644
index 0000000..78ca7c3
--- /dev/null
+++ b/libmodplug-64bit.patch
@@ -0,0 +1,37 @@
+--- libmodplug/src/libmodplug/stdafx.h
++++ libmodplug/src/libmodplug/stdafx.h
+@@ -31,21 +31,31 @@
+ typedef unsigned char UCHAR;
+ typedef unsigned char* PUCHAR;
+ typedef unsigned short USHORT;
++#if defined(_LP64)
++typedef unsigned int ULONG;
++typedef unsigned int UINT;
++typedef unsigned int DWORD;
++typedef int LONG;
++typedef long LONGLONG;
++typedef int * LPLONG;
++typedef unsigned int * LPDWORD;
++#else
+ typedef unsigned long ULONG;
+ typedef unsigned long UINT;
+ typedef unsigned long DWORD;
+ typedef long LONG;
++typedef long long LONGLONG;
++typedef long * LPLONG;
++typedef unsigned long * LPDWORD;
++#endif
+ typedef unsigned short WORD;
+ typedef unsigned char BYTE;
+ typedef unsigned char * LPBYTE;
+ typedef bool BOOL;
+ typedef char * LPSTR;
+ typedef void *  LPVOID;
+-typedef long * LPLONG;
+-typedef unsigned long * LPDWORD;
+ typedef unsigned short * LPWORD;
+ typedef const char * LPCSTR;
+-typedef long long LONGLONG;
+ typedef void * PVOID;
+ typedef void VOID;
+ 
diff --git a/libmodplug.spec b/libmodplug.spec
index 39b3d04..7114fd4 100644
--- a/libmodplug.spec
+++ b/libmodplug.spec
@@ -1,13 +1,14 @@
 Name:           libmodplug
 Version:        0.7
-Release:        2
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
 Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
-Source0:        http://dl.sf.net/modplug-xmms/libmodplug-0.7.tar.gz
+Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,7 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %package        devel
 Summary:        Development files for the Modplug mod music file format library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 %{summary}.
@@ -24,10 +26,11 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}, pkgconfig
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-%configure --enable-static --disable-dependency-tracking
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -37,7 +40,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
-%check || :
+%check
 make check
 
 
@@ -52,17 +55,22 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_libdir}/*.so.*
+%{_libdir}/libmodplug.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_includedir}/libmodplug/
+%{_libdir}/libmodplug.so
+%{_libdir}/pkgconfig/libmodplug.pc
 
 
 %changelog
+* Tue Aug 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:0.7-4
+- Don't ship static libs.
+
+* Tue Aug 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:0.7-3
+- Fix x86_64, thanks to Adam Goode (#166127).
+
 * Thu Mar 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:0.7-2
 - Build with dependency tracking disabled.
 - Run tests in the %%check section.