rpms/libmodplug/devel libmodplug-64bit.patch, NONE, 1.1 libmodplug.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/libmodplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18002

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-64bit.patch 
Log Message:
* 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).


libmodplug-64bit.patch:

--- NEW FILE libmodplug-64bit.patch ---
--- 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;
 


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmodplug.spec	17 Mar 2005 19:12:32 -0000	1.6
+++ libmodplug.spec	23 Aug 2005 16:10:13 -0000	1.7
@@ -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 @@
 %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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-%configure --enable-static --disable-dependency-tracking
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -37,7 +40,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
-%check || :
+%check
 make check
 
 
@@ -52,17 +55,22 @@
 %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.