X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=portablexdr%2Fmingw-portablexdr.spec;h=ce52d91cbe1008a6f258fb514c830d7fb9a780b6;hb=071db97d31315a919a7579565b973ce6558d792b;hp=28931c3dbe0911362f5b00306b90a36e0ae7ced5;hpb=0c153994f9b5c0de171c80d109299acd1bd41fd3;p=fedora-mingw.git

diff --git a/portablexdr/mingw-portablexdr.spec b/portablexdr/mingw-portablexdr.spec
index 28931c3..ce52d91 100644
--- a/portablexdr/mingw-portablexdr.spec
+++ b/portablexdr/mingw-portablexdr.spec
@@ -1,8 +1,8 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%include /usr/lib/rpm/mingw-defs
 
 Name:           mingw-portablexdr
-Version:        4.0.9
-Release:        2%{?dist}
+Version:        4.0.10
+Release:        4%{?dist}
 Summary:        MinGW Windows PortableXDR XDR / RPC library
 
 License:        LGPLv2+
@@ -11,10 +11,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 >= 19
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 
-Requires:       mingw-runtime
 
 %description
 MinGW Windows PortableXDR XDR / RPC library.
@@ -25,12 +27,7 @@ MinGW Windows PortableXDR XDR / RPC library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw
-
+%{_mingw_configure}
 make
 
 
@@ -39,10 +36,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Header files aren't installed by default, install them by hand.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/rpc
-install -m 0644 rpc/*.h \
-  $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/rpc
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libportablexdr.a
 
 
 %clean
@@ -51,10 +46,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_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
+
+* Tue Jul  8 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.10-1
+- New upstream release 4.0.10.
+- No need to manually install header files in this version.
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.9-2
 - Initial RPM release, largely based on earlier work from several sources.