Don't use RPM_OPT_FLAGS because they add -m64 on x86_64 arch. List all files explicit...

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 1d22975..6d94d69 100644 (file)
--- a/gnutls/mingw-gnutls.spec
+++ b/gnutls/mingw-gnutls.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-gnutls
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        LGPLv2+
@@ -29,7 +29,7 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
+CFLAGS="-O2 -g -Wall -pipe" \
 ./configure \
   --build=%_build \
   --host=i686-pc-mingw32 \
@@ -52,15 +52,49 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/certtool.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gnutls-cli-debug.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gnutls-cli.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gnutls-serv.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-26.def
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-26.dll
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-config
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-extra-26.def
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-extra-26.dll
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-extra-config
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-openssl-26.def
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgnutls-openssl-26.dll
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/psktool.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/srptool.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-extra.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-extra.dll.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-extra.la
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-openssl.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-openssl.dll.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls-openssl.la
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls.dll.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgnutls.la
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/gnutls-extra.pc
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/gnutls.pc
+%dir %{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gnutls
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gnutls/*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/libgnutls-extra.m4
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/libgnutls.m4
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/gnutls-*.png
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/gnutls.info*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/certtool.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/gnutls-cli-debug.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/gnutls-cli.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/gnutls-serv.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/psktool.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/srptool.1*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/gnutls_*.3*
 
 
 %changelog
+* Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.1-2
+- List files explicitly and use custom CFLAGS
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-1
 - Initial RPM release, largely based on earlier work from several sources.

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 85e7837..1626046 100644 (file)
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw-libgcrypt.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-libgcrypt
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows gcrypt encryption library
 
 License:        LGPLv2+
@@ -27,7 +27,7 @@ MinGW Windows gcrypt encryption library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
+CFLAGS="-O2 -g -Wall -pipe" \
 ./configure \
   --build=%_build \
   --host=i686-pc-mingw32 \
@@ -48,13 +48,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/dumpsexp.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgcrypt-11.dll
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgcrypt-config
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.def
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.dll.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.la
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gcrypt-module.h
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gcrypt.h
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/libgcrypt.m4
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/gcrypt.info
 
 %changelog
+* Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.1-2
+- List files explicitly and use custom CFLAGS
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
 - Initial RPM release, largely based on earlier work from several sources.

diff --git a/libgpg-error/mingw-libgpg-error.spec b/libgpg-error/mingw-libgpg-error.spec
index b946e91..5eac3e7 100644 (file)
--- a/libgpg-error/mingw-libgpg-error.spec
+++ b/libgpg-error/mingw-libgpg-error.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-libgpg-error
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -25,7 +25,7 @@ MinGW Windows GnuPGP error library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
+CFLAGS="-O2 -g -Wall -pipe" \
 ./configure \
   --build=%_build \
   --host=i686-pc-mingw32 \
@@ -46,13 +46,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gpg-error-config
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gpg-error.exe
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgpg-error-0.dll
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.dll.a
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.la
+%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gpg-error.h
 %{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/gpg-error.m4
 %{_prefix}/i686-pc-mingw32/sys-root/mingw/share/common-lisp/source/gpg-error/*
 
-
 %changelog
+* Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 1.6-2
+- List files explicitly and use custom CFLAGS
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
 - Initial RPM release, largely based on earlier work from several sources.

diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw-libvirt.spec
index adc26e2..3082670 100644 (file)
--- a/libvirt/mingw-libvirt.spec
+++ b/libvirt/mingw-libvirt.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-libvirt
 Version:        0.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows libvirt virtualization library
 
 License:        LGPLv2+
@@ -17,6 +17,7 @@ BuildRequires:  mingw-libgpg-error
 BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-gnutls
 BuildRequires:  mingw-libxml2
+BuildRequires:  mingw-portablexdr
 
 Requires:       mingw-runtime
 Requires:       mingw-libgpg-error
@@ -33,9 +34,9 @@ MinGW Windows libvirt virtualization library.
 
 
 %build
-# Make sure the true libxml path is available very early ...
-CC="i686-pc-mingw32-gcc -I%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/libxml2" \
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
+PKG_CONFIG_PATH="%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \
+CC="i686-pc-mingw32-gcc" \
+CFLAGS="-O2 -g -Wall -pipe" \
 ./configure \
   --build=%_build \
   --host=i686-pc-mingw32 \
@@ -69,5 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  2 2008  <berrange@li15-219.members.linode.com> - 0.4.4-2
+- Add BR on portablexdr, set PKG_CONFIG_PATH for libxml/gnutls, set CFLAGS
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4-1
 - Initial RPM release, largely based on earlier work from several sources.

diff --git a/portablexdr/mingw-portablexdr.spec b/portablexdr/mingw-portablexdr.spec
index 7784b4b..2ca86c2 100644 (file)
--- a/portablexdr/mingw-portablexdr.spec
+++ b/portablexdr/mingw-portablexdr.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-portablexdr
 Version:        4.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows PortableXDR XDR / RPC library
 
 License:        LGPLv2+
@@ -25,7 +25,7 @@ MinGW Windows PortableXDR XDR / RPC library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
+CFLAGS="-O2 -g -Wall -pipe" \
 ./configure \
   --build=%_build \
   --host=i686-pc-mingw32 \
@@ -46,12 +46,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
+%{_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
 
-
 %changelog
+* 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.