X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=portablexdr%2Fmingw-portablexdr.spec;h=4069aceff693af645a0a5cbc7ceebde224c1a567;hb=05595ccae6456def62736a42dced9f90490858d3;hp=2ca86c29fce006f04f375a408b1dcfec5588f2b5;hpb=e0a0296e132f4b0201da0d5d8cb8aa3026a0273b;p=fedora-mingw.git

diff --git a/portablexdr/mingw-portablexdr.spec b/portablexdr/mingw-portablexdr.spec
index 2ca86c2..4069ace 100644
--- a/portablexdr/mingw-portablexdr.spec
+++ b/portablexdr/mingw-portablexdr.spec
@@ -1,8 +1,12 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-portablexdr
 Version:        4.0.10
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows PortableXDR XDR / RPC library
 
 License:        LGPLv2+
@@ -11,10 +15,12 @@ URL:            http://et.redhat.com/~rjones/portablexdr/
 Source0:        http://et.redhat.com/~rjones/portablexdr/portablexdr-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:      noarch
+
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 
-Requires:       mingw-runtime
 
 %description
 MinGW Windows PortableXDR XDR / RPC library.
@@ -25,12 +31,7 @@ MinGW Windows PortableXDR XDR / RPC library.
 
 
 %build
-CFLAGS="-O2 -g -Wall -pipe" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw
-
+%{_mingw_configure}
 make
 
 
@@ -39,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libportablexdr.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,13 +50,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libportablexdr-0.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libportablexdr.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libportablexdr.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libportablexdr.la
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/rpc
+%{_mingw_bindir}/libportablexdr-0.dll
+%{_mingw_libdir}/libportablexdr.dll.a
+%{_mingw_libdir}/libportablexdr.la
+%{_mingw_includedir}/rpc
+
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.10-4
+- Remove static library.
+
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.10-3
+- Use RPM macros from mingw-filesystem.
+
 * Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 4.0.10-2
 - List files explicitly and set custom CFLAGS