X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=flexdll%2Fmingw32-flexdll.spec;h=92e731472d2c3050f511d1e7ce346d6cd8c3271a;hb=e35583101ceb908e40da1c0d1b3914215667e580;hp=c828c9d0a0eb80fd168ff9f68403f57e6375d24b;hpb=7d78e8ae1963f5fb71fe43ebd5544397aa861e5c;p=fedora-mingw.git

diff --git a/flexdll/mingw32-flexdll.spec b/flexdll/mingw32-flexdll.spec
index c828c9d..92e7314 100644
--- a/flexdll/mingw32-flexdll.spec
+++ b/flexdll/mingw32-flexdll.spec
@@ -6,9 +6,12 @@
 
 %define debug_package %{nil}
 
+# Running the tests requires Wine.
+%define run_tests 0
+
 Name:           mingw32-flexdll
 Version:        0.11
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        FlexDLL Windows DLL plugin API which is like dlopen
 
 License:        zlib
@@ -27,6 +30,7 @@ BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  ocaml
+BuildRequires:  dos2unix
 
 
 %description
@@ -82,7 +86,9 @@ strip flexlink.exe
 
 
 %check
+%if %{run_tests}
 make -C test CC=%{_mingw32_cc} O=o CHAIN=mingw
+%endif
 
 
 %install
@@ -100,10 +106,12 @@ install -m 0755 flexlink.exe \
   $RPM_BUILD_ROOT%{_libdir}/flexdll
 
 # Provide a wrapper script which sets FLEXDIR to point to the
-# libdir directory.
+# libdir directory.  Some programs call 'flexlink' and some call
+# 'flexlink.exe' so provide both.
 sed 's,@libdir@,%{_libdir},g' \
   < %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/flexlink.exe
 chmod 0755 $RPM_BUILD_ROOT%{_bindir}/flexlink.exe
+(cd $RPM_BUILD_ROOT%{_bindir} && ln flexlink.exe flexlink)
 
 
 %clean
@@ -113,10 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE README CHANGES
+%{_bindir}/flexlink
 %{_bindir}/flexlink.exe
 %{_libdir}/flexdll
 
 
 %changelog
-* Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-1
+* Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-4
 - Initial RPM release.