-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-atk
+Name: mingw32-atk
Version: 1.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Atk library
License: LGPLv2+
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-iconv
-BuildRequires: mingw-gettext
-BuildRequires: mingw-glib2
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-glib2
BuildRequires: pkgconfig
# Need native one too for msgfmt
BuildRequires: gettext
# Need native one too for glib-genmarshal
BuildRequires: glib2-devel
+
%description
MinGW Windows Atk library.
%prep
%setup -q -n atk-%{version}
+
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libatk-1.0-0.dll
-%{_mingw_includedir}/atk-1.0
-%{_mingw_libdir}/atk-1.0.def
-%{_mingw_libdir}/libatk-1.0.dll.a
-%{_mingw_libdir}/libatk-1.0.la
-%{_mingw_libdir}/pkgconfig/atk.pc
-%{_mingw_datadir}/gtk-doc/html/atk/
-%{_mingw_datadir}/locale/*/LC_MESSAGES/atk10.mo
+%{_mingw32_bindir}/libatk-1.0-0.dll
+%{_mingw32_includedir}/atk-1.0
+%{_mingw32_libdir}/atk-1.0.def
+%{_mingw32_libdir}/libatk-1.0.dll.a
+%{_mingw32_libdir}/libatk-1.0.la
+%{_mingw32_libdir}/pkgconfig/atk.pc
+%{_mingw32_datadir}/gtk-doc/html/atk/
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/atk10.mo
+
%changelog
+* Wed Sep 24 2008 Daniel P. Berrange <berrange@redhat.com> - 1.24.0-2
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.24.0-1
- Update to 1.24.0 release
+++ /dev/null
-%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-cairo
-Version: 1.7.4
-Release: 3%{?dist}
-Summary: MinGW Windows Cairo library
-
-License: LGPLv2 or MPLv1.1
-URL: http://cairographics.org
-Source0: http://cairographics.org/snapshots/cairo-%{version}.tar.gz
-Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libxml2
-BuildRequires: mingw-pixman
-BuildRequires: mingw-freetype
-BuildRequires: mingw-libpng
-BuildRequires: mingw-fontconfig
-BuildRequires: pkgconfig
-
-%description
-MinGW Windows Cairo library.
-
-
-%prep
-%setup -q -n cairo-%{version}
-
-%build
-%{_mingw_configure} --disable-xlib --disable-xcb --enable-win32 --enable-png --enable-freetype
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
-
-rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/libcairo.a
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{_mingw_bindir}/libcairo-2.dll
-%{_mingw_includedir}/cairo/
-%{_mingw_libdir}/libcairo.dll.a
-%{_mingw_libdir}/libcairo.la
-%{_mingw_libdir}/pkgconfig/cairo-ft.pc
-%{_mingw_libdir}/pkgconfig/cairo-pdf.pc
-%{_mingw_libdir}/pkgconfig/cairo-png.pc
-%{_mingw_libdir}/pkgconfig/cairo-ps.pc
-%{_mingw_libdir}/pkgconfig/cairo-svg.pc
-%{_mingw_libdir}/pkgconfig/cairo-win32-font.pc
-%{_mingw_libdir}/pkgconfig/cairo-win32.pc
-%{_mingw_libdir}/pkgconfig/cairo.pc
-%{_mingw_datadir}/gtk-doc/html/cairo/
-
-
-%changelog
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-3
-- Added dep on pkgconfig
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-2
-- Remove static libraries.
-- Fix source URL.
-
-* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-1
-- Initial RPM release
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-cairo
+Version: 1.7.4
+Release: 4%{?dist}
+Summary: MinGW Windows Cairo library
+
+License: LGPLv2 or MPLv1.1
+URL: http://cairographics.org
+Source0: http://cairographics.org/snapshots/cairo-%{version}.tar.gz
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libxml2
+BuildRequires: mingw32-pixman
+BuildRequires: mingw32-freetype
+BuildRequires: mingw32-libpng
+BuildRequires: mingw32-fontconfig
+BuildRequires: pkgconfig
+
+%description
+MinGW Windows Cairo library.
+
+
+%prep
+%setup -q -n cairo-%{version}
+
+%build
+%{_mingw32_configure} --disable-xlib --disable-xcb --enable-win32 --enable-png --enable-freetype
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
+
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libcairo.a
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/libcairo-2.dll
+%{_mingw32_includedir}/cairo/
+%{_mingw32_libdir}/libcairo.dll.a
+%{_mingw32_libdir}/libcairo.la
+%{_mingw32_libdir}/pkgconfig/cairo-ft.pc
+%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
+%{_mingw32_libdir}/pkgconfig/cairo-png.pc
+%{_mingw32_libdir}/pkgconfig/cairo-ps.pc
+%{_mingw32_libdir}/pkgconfig/cairo-svg.pc
+%{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
+%{_mingw32_libdir}/pkgconfig/cairo-win32.pc
+%{_mingw32_libdir}/pkgconfig/cairo.pc
+%{_mingw32_datadir}/gtk-doc/html/cairo/
+
+
+%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-4
+- Rename mingw -> mingw32.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-3
+- Added dep on pkgconfig
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-2
+- Remove static libraries.
+- Fix source URL.
+
+* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-1
+- Initial RPM release
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 26
+Version: 27
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
Requires: rpm
# These are actually provided by Windows itself, or Wine.
-Provides: mingw32(msvcrt.dll)
-Provides: mingw32(kernel32.dll)
-Provides: mingw32(user32.dll)
Provides: mingw32(gdi32.dll)
+Provides: mingw32(kernel32.dll)
Provides: mingw32(ole32.dll)
+Provides: mingw32(mscoree.dll)
+Provides: mingw32(msvcrt.dll)
+Provides: mingw32(user32.dll)
Obsoletes: mingw-filesystem = %{version}-%{release}
Provides: mingw-filesystem < 26
%changelog
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 26-1
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 27-1
- Begin the grand renaming of mingw -> mingw32.
+- Added mingw32(mscoree.dll).
* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 25-1
- Add shared aclocal directory.
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-fontconfig
+Name: mingw32-fontconfig
Version: 2.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Fontconfig library
License: MIT
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: mingw-fontconfig-2.6.0-remove-logfile.patch
+Patch0: mingw32-fontconfig-2.6.0-remove-logfile.patch
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-freetype
-BuildRequires: mingw-libxml2
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-freetype
+BuildRequires: mingw32-libxml2
BuildRequires: pkgconfig
BuildRequires: docbook-utils
BuildRequires: autoconf automake libtool
%build
-PATH="%{_mingw_bindir}:$PATH" \
-%{_mingw_configure} --with-arch=i686
+PATH="%{_mingw32_bindir}:$PATH" \
+%{_mingw32_configure} --with-arch=i686
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfontconfig.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a
# Remove duplicate manpages.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/fc-cache.exe
-%{_mingw_bindir}/fc-cat.exe
-%{_mingw_bindir}/fc-list.exe
-%{_mingw_bindir}/fc-match.exe
-%{_mingw_bindir}/libfontconfig-1.dll
-%{_mingw_libdir}/fontconfig.def
-%{_mingw_libdir}/libfontconfig.dll.a
-%{_mingw_libdir}/libfontconfig.la
-%{_mingw_libdir}/pkgconfig/fontconfig.pc
-%{_mingw_includedir}/fontconfig/
-%{_mingw_sysconfdir}/fonts/
-%{_mingw_datadir}/doc/fontconfig
+%{_mingw32_bindir}/fc-cache.exe
+%{_mingw32_bindir}/fc-cat.exe
+%{_mingw32_bindir}/fc-list.exe
+%{_mingw32_bindir}/fc-match.exe
+%{_mingw32_bindir}/libfontconfig-1.dll
+%{_mingw32_libdir}/fontconfig.def
+%{_mingw32_libdir}/libfontconfig.dll.a
+%{_mingw32_libdir}/libfontconfig.la
+%{_mingw32_libdir}/pkgconfig/fontconfig.pc
+%{_mingw32_includedir}/fontconfig/
+%{_mingw32_sysconfdir}/fonts/
+%{_mingw32_datadir}/doc/fontconfig
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-5
+- Rename mingw -> mingw32.
+
* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-4
- Remove duplicate manpages.
- Patch to delete logfile left when building (unused) manpages.
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-freetype
+Name: mingw32-freetype
Version: 2.3.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Freetype library
License: FTL or GPLv2+
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 25
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-zlib
+BuildRequires: mingw32-filesystem >= 25
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-zlib
%description
MinGW Windows Freetype library.
%setup -q -n freetype-%{version} -b 1 -a 1
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfreetype.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfreetype.a
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/freetype-config
-%{_mingw_bindir}/libfreetype-6.dll
-%{_mingw_includedir}/freetype2
-%{_mingw_includedir}/ft2build.h
-%{_mingw_libdir}/libfreetype.dll.a
-%{_mingw_libdir}/libfreetype.la
-%{_mingw_libdir}/pkgconfig/freetype2.pc
-%{_mingw_datadir}/aclocal/freetype2.m4
+%{_mingw32_bindir}/freetype-config
+%{_mingw32_bindir}/libfreetype-6.dll
+%{_mingw32_includedir}/freetype2
+%{_mingw32_includedir}/ft2build.h
+%{_mingw32_libdir}/libfreetype.dll.a
+%{_mingw32_libdir}/libfreetype.la
+%{_mingw32_libdir}/pkgconfig/freetype2.pc
+%{_mingw32_datadir}/aclocal/freetype2.m4
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-5
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.3.7-4
- Import patches from rawhide & add docs
+++ /dev/null
-%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-gdb
-Version: 6.8
-Release: 2%{?dist}
-Summary: MinGW port of the GNU debugger (gdb)
-
-License: GPLv2+
-Group: Development/Libraries
-URL: http://www.mingw.org/MinGWiki/index.php/gdb
-Source0: http://dl.sourceforge.net/sourceforge/mingw/gdb-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch0: mingw-gdb-6.8-no-getcwd-error.patch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: flex
-
-
-%description
-This is the MinGW port of the GNU debugger (gdb).
-
-Note this is a Fedora native binary which debugs Windows target
-executables.
-
-
-%prep
-%setup -q -n gdb-%{version}
-%patch0 -p1
-
-
-%build
-# Using echo normalizes spaces between the flags.
-PKG_CONFIG_PATH="%{_mingw_libdir}/pkgconfig" \
-CC="%{_mingw_cc}" \
-CFLAGS=`echo %{_mingw_cflags}` \
-./configure \
- --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \
- --prefix=%{_mingw_prefix} \
- --infodir=%{_mingw_datadir}/info \
- --mandir=%{_mingw_mandir}
-
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{_mingw_bindir}/gdb.exe
-%{_mingw_bindir}/gdbserver.exe
-%{_mingw_libdir}/libbfd.a
-%{_mingw_libdir}/libbfd.la
-%{_mingw_libdir}/libiberty.a
-%{_mingw_libdir}/libopcodes.a
-%{_mingw_libdir}/libopcodes.la
-%{_mingw_includedir}/*
-%{_mingw_datadir}/info/*
-%{_mingw_mandir}/man1/*.1*
-%{_mingw_datadir}/locale/*/LC_MESSAGES/*
-
-
-%changelog
-* Fri Sep 12 2008 Richard W.M. Jones <rjones@redhat.com> - 6.8-2
-- Initial RPM release.
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-gdb
+Version: 6.8
+Release: 3%{?dist}
+Summary: MinGW port of the GNU debugger (gdb)
+
+License: GPLv2+
+Group: Development/Libraries
+URL: http://www.mingw.org/MinGWiki/index.php/gdb
+Source0: http://dl.sourceforge.net/sourceforge/mingw/gdb-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: mingw32-gdb-6.8-no-getcwd-error.patch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: flex
+
+
+%description
+This is the MinGW port of the GNU debugger (gdb).
+
+Note this is a Fedora native binary which debugs Windows target
+executables.
+
+
+%prep
+%setup -q -n gdb-%{version}
+%patch0 -p1
+
+
+%build
+# Using echo normalizes spaces between the flags.
+PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig" \
+CC="%{_mingw32_cc}" \
+CFLAGS=`echo %{_mingw32_cflags}` \
+./configure \
+ --build=%_build --host=%{_mingw32_host} --target=%{_mingw32_target} \
+ --prefix=%{_mingw32_prefix} \
+ --infodir=%{_mingw32_datadir}/info \
+ --mandir=%{_mingw32_mandir}
+
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/gdb.exe
+%{_mingw32_bindir}/gdbserver.exe
+%{_mingw32_libdir}/libbfd.a
+%{_mingw32_libdir}/libbfd.la
+%{_mingw32_libdir}/libiberty.a
+%{_mingw32_libdir}/libopcodes.a
+%{_mingw32_libdir}/libopcodes.la
+%{_mingw32_includedir}/*
+%{_mingw32_datadir}/info/*
+%{_mingw32_mandir}/man1/*.1*
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/*
+
+
+%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 6.8-3
+- Rename mingw -> mingw32.
+
+* Fri Sep 12 2008 Richard W.M. Jones <rjones@redhat.com> - 6.8-2
+- Initial RPM release.
+++ /dev/null
-%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-gettext
-Version: 0.17
-Release: 4%{?dist}
-Summary: GNU libraries and utilities for producing multi-lingual messages
-
-License: GPLv2+ and LGPLv2+
-Group: Development/Libraries
-URL: http://www.gnu.org/software/gettext/
-Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-gcc-c++
-BuildRequires: mingw-binutils
-BuildRequires: mingw-iconv
-
-
-%description
-MinGW Windows Gettext library
-
-%prep
-%setup -q -n gettext-%{version}
-
-%build
-%{_mingw_configure} \
- --disable-java \
- --disable-native-java \
- --disable-csharp \
- --enable-threads=win32 \
- --without-emacs
-
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
-rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
-rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
-
-# Remove static libraries.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libasprintf.a
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgettextpo.a
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libintl.a
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{_mingw_bindir}/autopoint
-%{_mingw_bindir}/envsubst.exe
-%{_mingw_bindir}/gettext.exe
-%{_mingw_bindir}/gettext.sh
-%{_mingw_bindir}/gettextize
-%{_mingw_bindir}/libasprintf-0.dll
-%{_mingw_bindir}/libgettextlib-0-17.dll
-%{_mingw_bindir}/libgettextpo-0.dll
-%{_mingw_bindir}/libgettextsrc-0-17.dll
-%{_mingw_bindir}/libintl-8.dll
-%{_mingw_bindir}/msg*.exe
-%{_mingw_bindir}/ngettext.exe
-%{_mingw_bindir}/recode-sr-latin.exe
-%{_mingw_bindir}/xgettext.exe
-
-%{_mingw_includedir}/autosprintf.h
-%{_mingw_includedir}/gettext-po.h
-%{_mingw_includedir}/libintl.h
-
-%{_mingw_libdir}/gettext
-
-%{_mingw_libdir}/libasprintf.dll.a
-%{_mingw_libdir}/libasprintf.la
-
-%{_mingw_libdir}/libgettextlib.dll.a
-%{_mingw_libdir}/libgettextlib.la
-
-%{_mingw_libdir}/libgettextpo.dll.a
-%{_mingw_libdir}/libgettextpo.la
-
-%{_mingw_libdir}/libgettextsrc.dll.a
-%{_mingw_libdir}/libgettextsrc.la
-
-%{_mingw_libdir}/libintl.dll.a
-%{_mingw_libdir}/libintl.la
-
-%{_mingw_docdir}/gettext
-%{_mingw_docdir}/libasprintf/autosprintf_all.html
-
-%{_mingw_datadir}/gettext/
-
-%{_mingw_datadir}/aclocal/*m4
-%{_mingw_datadir}/info/autosprintf.info
-%{_mingw_datadir}/info/gettext.info
-
-%{_mingw_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
-%{_mingw_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo
-
-%{_mingw_mandir}/man1/autopoint.1*
-%{_mingw_mandir}/man1/envsubst.1*
-%{_mingw_mandir}/man1/gettext.1*
-%{_mingw_mandir}/man1/gettextize.1*
-%{_mingw_mandir}/man1/msg*1*
-%{_mingw_mandir}/man1/ngettext.1*
-%{_mingw_mandir}/man1/recode-sr-latin.1*
-%{_mingw_mandir}/man1/xgettext.1*
-
-%{_mingw_mandir}/man3/bind_textdomain_codeset.3*
-%{_mingw_mandir}/man3/bindtextdomain.3*
-%{_mingw_mandir}/man3/dcgettext.3*
-%{_mingw_mandir}/man3/dcngettext.3*
-%{_mingw_mandir}/man3/dgettext.3*
-%{_mingw_mandir}/man3/dngettext.3*
-%{_mingw_mandir}/man3/gettext.3*
-%{_mingw_mandir}/man3/ngettext.3*
-%{_mingw_mandir}/man3/textdomain.3*
-
-
-%changelog
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-4
-- Disable emacs lisp file install
-
-* Thu Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
-- Remove static libraries.
-
-* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
-- Use RPM macros from mingw-filesystem.
-
-* Tue Sep 2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-1
-- Initial RPM release, largely based on earlier work from several sources.
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-gettext
+Version: 0.17
+Release: 5%{?dist}
+Summary: GNU libraries and utilities for producing multi-lingual messages
+
+License: GPLv2+ and LGPLv2+
+Group: Development/Libraries
+URL: http://www.gnu.org/software/gettext/
+Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-gcc-c++
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-iconv
+
+
+%description
+MinGW Windows Gettext library
+
+%prep
+%setup -q -n gettext-%{version}
+
+%build
+%{_mingw32_configure} \
+ --disable-java \
+ --disable-native-java \
+ --disable-csharp \
+ --enable-threads=win32 \
+ --without-emacs
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
+
+# Remove static libraries.
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libasprintf.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgettextpo.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.a
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/autopoint
+%{_mingw32_bindir}/envsubst.exe
+%{_mingw32_bindir}/gettext.exe
+%{_mingw32_bindir}/gettext.sh
+%{_mingw32_bindir}/gettextize
+%{_mingw32_bindir}/libasprintf-0.dll
+%{_mingw32_bindir}/libgettextlib-0-17.dll
+%{_mingw32_bindir}/libgettextpo-0.dll
+%{_mingw32_bindir}/libgettextsrc-0-17.dll
+%{_mingw32_bindir}/libintl-8.dll
+%{_mingw32_bindir}/msg*.exe
+%{_mingw32_bindir}/ngettext.exe
+%{_mingw32_bindir}/recode-sr-latin.exe
+%{_mingw32_bindir}/xgettext.exe
+
+%{_mingw32_includedir}/autosprintf.h
+%{_mingw32_includedir}/gettext-po.h
+%{_mingw32_includedir}/libintl.h
+
+%{_mingw32_libdir}/gettext
+
+%{_mingw32_libdir}/libasprintf.dll.a
+%{_mingw32_libdir}/libasprintf.la
+
+%{_mingw32_libdir}/libgettextlib.dll.a
+%{_mingw32_libdir}/libgettextlib.la
+
+%{_mingw32_libdir}/libgettextpo.dll.a
+%{_mingw32_libdir}/libgettextpo.la
+
+%{_mingw32_libdir}/libgettextsrc.dll.a
+%{_mingw32_libdir}/libgettextsrc.la
+
+%{_mingw32_libdir}/libintl.dll.a
+%{_mingw32_libdir}/libintl.la
+
+%{_mingw32_docdir}/gettext
+%{_mingw32_docdir}/libasprintf/autosprintf_all.html
+
+%{_mingw32_datadir}/gettext/
+
+%{_mingw32_datadir}/aclocal/*m4
+%{_mingw32_datadir}/info/autosprintf.info
+%{_mingw32_datadir}/info/gettext.info
+
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo
+
+%{_mingw32_mandir}/man1/autopoint.1*
+%{_mingw32_mandir}/man1/envsubst.1*
+%{_mingw32_mandir}/man1/gettext.1*
+%{_mingw32_mandir}/man1/gettextize.1*
+%{_mingw32_mandir}/man1/msg*1*
+%{_mingw32_mandir}/man1/ngettext.1*
+%{_mingw32_mandir}/man1/recode-sr-latin.1*
+%{_mingw32_mandir}/man1/xgettext.1*
+
+%{_mingw32_mandir}/man3/bind_textdomain_codeset.3*
+%{_mingw32_mandir}/man3/bindtextdomain.3*
+%{_mingw32_mandir}/man3/dcgettext.3*
+%{_mingw32_mandir}/man3/dcngettext.3*
+%{_mingw32_mandir}/man3/dgettext.3*
+%{_mingw32_mandir}/man3/dngettext.3*
+%{_mingw32_mandir}/man3/gettext.3*
+%{_mingw32_mandir}/man3/ngettext.3*
+%{_mingw32_mandir}/man3/textdomain.3*
+
+
+%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-5
+- Rename mingw -> mingw32.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-4
+- Disable emacs lisp file install
+
+* Thu Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
+- Remove static libraries.
+
+* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
+- Use RPM macros from mingw-filesystem.
+
+* Tue Sep 2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-1
+- Initial RPM release, largely based on earlier work from several sources.
+++ /dev/null
-%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-glib2
-Version: 2.18.1
-Release: 1%{?dist}
-Summary: MinGW Windows GLib2 library
-
-License: LGPLv2+
-Group: Development/Libraries
-URL: http://www.gtk.org
-Source0: http://download.gnome.org/sources/glib/2.18/glib-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-Patch2: gio-2.16-only-pass-uri-to-gio-apps.patch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-iconv
-BuildRequires: mingw-gettext
-BuildRequires: pkgconfig
-# Native version required for msgfmt use in build
-BuildRequires: gettext
-# Native version required for glib-genmarshal
-BuildRequires: glib2-devel
-
-%description
-MinGW Windows Glib2 library.
-
-
-%prep
-%setup -q -n glib-%{version}
-%patch2 -p1
-
-
-%build
-%{_mingw_configure}
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
-
-# Remove manpages which duplicate Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{_mingw_bindir}/glib-genmarshal.exe
-%{_mingw_bindir}/glib-gettextize
-%{_mingw_bindir}/glib-mkenums
-%{_mingw_bindir}/gobject-query.exe
-%{_mingw_bindir}/gspawn-win32-helper-console.exe
-%{_mingw_bindir}/gspawn-win32-helper.exe
-%{_mingw_bindir}/libgio-2.0-0.dll
-%{_mingw_bindir}/libglib-2.0-0.dll
-%{_mingw_bindir}/libgmodule-2.0-0.dll
-%{_mingw_bindir}/libgobject-2.0-0.dll
-%{_mingw_bindir}/libgthread-2.0-0.dll
-%{_mingw_includedir}/glib-2.0/
-%{_mingw_libdir}/gio-2.0.def
-%{_mingw_libdir}/glib-2.0.def
-%{_mingw_libdir}/glib-2.0/
-%{_mingw_libdir}/gmodule-2.0.def
-%{_mingw_libdir}/gobject-2.0.def
-%{_mingw_libdir}/gthread-2.0.def
-%{_mingw_libdir}/libgio-2.0.dll.a
-%{_mingw_libdir}/libgio-2.0.la
-%{_mingw_libdir}/libglib-2.0.dll.a
-%{_mingw_libdir}/libglib-2.0.la
-%{_mingw_libdir}/libgmodule-2.0.dll.a
-%{_mingw_libdir}/libgmodule-2.0.la
-%{_mingw_libdir}/libgobject-2.0.dll.a
-%{_mingw_libdir}/libgobject-2.0.la
-%{_mingw_libdir}/libgthread-2.0.dll.a
-%{_mingw_libdir}/libgthread-2.0.la
-%{_mingw_libdir}/pkgconfig/gio-2.0.pc
-%{_mingw_libdir}/pkgconfig/gio-unix-2.0.pc
-%{_mingw_libdir}/pkgconfig/glib-2.0.pc
-%{_mingw_libdir}/pkgconfig/gmodule-2.0.pc
-%{_mingw_libdir}/pkgconfig/gmodule-export-2.0.pc
-%{_mingw_libdir}/pkgconfig/gmodule-no-export-2.0.pc
-%{_mingw_libdir}/pkgconfig/gobject-2.0.pc
-%{_mingw_libdir}/pkgconfig/gthread-2.0.pc
-%{_mingw_datadir}/aclocal/glib-2.0.m4
-%{_mingw_datadir}/aclocal/glib-gettext.m4
-%{_mingw_datadir}/glib-2.0/
-%{_mingw_datadir}/gtk-doc/html/gio/
-%{_mingw_datadir}/gtk-doc/html/glib/
-%{_mingw_datadir}/gtk-doc/html/gobject/
-%{_mingw_datadir}/locale/*/LC_MESSAGES/glib20.mo
-
-
-%changelog
-* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.1-1
-- Update to 2.18.1 release
-
-* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.0-3
-- Remove manpages which duplicate Fedora native.
-
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-2
-- Add BR on pkgconfig, gettext and glib2 (native)
-
-* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
-- Initial RPM release
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-glib2
+Version: 2.18.1
+Release: 2%{?dist}
+Summary: MinGW Windows GLib2 library
+
+License: LGPLv2+
+Group: Development/Libraries
+URL: http://www.gtk.org
+Source0: http://download.gnome.org/sources/glib/2.18/glib-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+Patch2: gio-2.16-only-pass-uri-to-gio-apps.patch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gettext
+BuildRequires: pkgconfig
+# Native version required for msgfmt use in build
+BuildRequires: gettext
+# Native version required for glib-genmarshal
+BuildRequires: glib2-devel
+
+%description
+MinGW Windows Glib2 library.
+
+
+%prep
+%setup -q -n glib-%{version}
+%patch2 -p1
+
+
+%build
+%{_mingw32_configure}
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+
+# Remove manpages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/glib-genmarshal.exe
+%{_mingw32_bindir}/glib-gettextize
+%{_mingw32_bindir}/glib-mkenums
+%{_mingw32_bindir}/gobject-query.exe
+%{_mingw32_bindir}/gspawn-win32-helper-console.exe
+%{_mingw32_bindir}/gspawn-win32-helper.exe
+%{_mingw32_bindir}/libgio-2.0-0.dll
+%{_mingw32_bindir}/libglib-2.0-0.dll
+%{_mingw32_bindir}/libgmodule-2.0-0.dll
+%{_mingw32_bindir}/libgobject-2.0-0.dll
+%{_mingw32_bindir}/libgthread-2.0-0.dll
+%{_mingw32_includedir}/glib-2.0/
+%{_mingw32_libdir}/gio-2.0.def
+%{_mingw32_libdir}/glib-2.0.def
+%{_mingw32_libdir}/glib-2.0/
+%{_mingw32_libdir}/gmodule-2.0.def
+%{_mingw32_libdir}/gobject-2.0.def
+%{_mingw32_libdir}/gthread-2.0.def
+%{_mingw32_libdir}/libgio-2.0.dll.a
+%{_mingw32_libdir}/libgio-2.0.la
+%{_mingw32_libdir}/libglib-2.0.dll.a
+%{_mingw32_libdir}/libglib-2.0.la
+%{_mingw32_libdir}/libgmodule-2.0.dll.a
+%{_mingw32_libdir}/libgmodule-2.0.la
+%{_mingw32_libdir}/libgobject-2.0.dll.a
+%{_mingw32_libdir}/libgobject-2.0.la
+%{_mingw32_libdir}/libgthread-2.0.dll.a
+%{_mingw32_libdir}/libgthread-2.0.la
+%{_mingw32_libdir}/pkgconfig/gio-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc
+%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
+%{_mingw32_datadir}/aclocal/glib-2.0.m4
+%{_mingw32_datadir}/aclocal/glib-gettext.m4
+%{_mingw32_datadir}/glib-2.0/
+%{_mingw32_datadir}/gtk-doc/html/gio/
+%{_mingw32_datadir}/gtk-doc/html/glib/
+%{_mingw32_datadir}/gtk-doc/html/gobject/
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/glib20.mo
+
+
+%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.1-2
+- Rename mingw -> mingw32.
+
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.1-1
+- Update to 2.18.1 release
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.0-3
+- Remove manpages which duplicate Fedora native.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-2
+- Add BR on pkgconfig, gettext and glib2 (native)
+
+* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+- Initial RPM release
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-gnutls
+Name: mingw32-gnutls
Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
Patch0: gnutls-certtool-build.patch
Patch1: gnutls-2.4.0-nosrp.patch
-BuildRequires: mingw-filesystem >= 25
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libgpg-error
-BuildRequires: mingw-libgcrypt
-BuildRequires: mingw-iconv
-BuildRequires: mingw-gettext
-BuildRequires: mingw-zlib
+BuildRequires: mingw32-filesystem >= 25
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libgpg-error
+BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-zlib
BuildRequires: autoconf automake libtool
%description
%build
autoreconf
-PATH="%{_mingw_bindir}:$PATH" \
-%{_mingw_configure} --with-included-libtasn1 --disable-cxx \
+PATH="%{_mingw32_bindir}:$PATH" \
+%{_mingw32_configure} --with-included-libtasn1 --disable-cxx \
--disable-srp-authentication
make
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
+rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls-extra.a
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls-openssl.a
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls-extra.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls-openssl.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls.a
# Remove info and man pages which duplicate stuff in Fedora already.
-rm -rf $RPM_BUILD_ROOT%{_mingw_infodir}
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/certtool.exe
-%{_mingw_bindir}/gnutls-cli-debug.exe
-%{_mingw_bindir}/gnutls-cli.exe
-%{_mingw_bindir}/gnutls-serv.exe
-%{_mingw_bindir}/libgnutls-26.def
-%{_mingw_bindir}/libgnutls-26.dll
-%{_mingw_bindir}/libgnutls-config
-%{_mingw_bindir}/libgnutls-extra-26.def
-%{_mingw_bindir}/libgnutls-extra-26.dll
-%{_mingw_bindir}/libgnutls-extra-config
-%{_mingw_bindir}/libgnutls-openssl-26.def
-%{_mingw_bindir}/libgnutls-openssl-26.dll
-%{_mingw_bindir}/psktool.exe
-%{_mingw_libdir}/libgnutls-extra.dll.a
-%{_mingw_libdir}/libgnutls-extra.la
-%{_mingw_libdir}/libgnutls-openssl.dll.a
-%{_mingw_libdir}/libgnutls-openssl.la
-%{_mingw_libdir}/libgnutls.dll.a
-%{_mingw_libdir}/libgnutls.la
-%{_mingw_libdir}/pkgconfig/gnutls-extra.pc
-%{_mingw_libdir}/pkgconfig/gnutls.pc
-%{_mingw_includedir}/gnutls/
-%{_mingw_datadir}/aclocal/libgnutls-extra.m4
-%{_mingw_datadir}/aclocal/libgnutls.m4
-%{_mingw_datadir}/locale/*/LC_MESSAGES/gnutls.mo
+%{_mingw32_bindir}/certtool.exe
+%{_mingw32_bindir}/gnutls-cli-debug.exe
+%{_mingw32_bindir}/gnutls-cli.exe
+%{_mingw32_bindir}/gnutls-serv.exe
+%{_mingw32_bindir}/libgnutls-26.def
+%{_mingw32_bindir}/libgnutls-26.dll
+%{_mingw32_bindir}/libgnutls-config
+%{_mingw32_bindir}/libgnutls-extra-26.def
+%{_mingw32_bindir}/libgnutls-extra-26.dll
+%{_mingw32_bindir}/libgnutls-extra-config
+%{_mingw32_bindir}/libgnutls-openssl-26.def
+%{_mingw32_bindir}/libgnutls-openssl-26.dll
+%{_mingw32_bindir}/psktool.exe
+%{_mingw32_libdir}/libgnutls-extra.dll.a
+%{_mingw32_libdir}/libgnutls-extra.la
+%{_mingw32_libdir}/libgnutls-openssl.dll.a
+%{_mingw32_libdir}/libgnutls-openssl.la
+%{_mingw32_libdir}/libgnutls.dll.a
+%{_mingw32_libdir}/libgnutls.la
+%{_mingw32_libdir}/pkgconfig/gnutls-extra.pc
+%{_mingw32_libdir}/pkgconfig/gnutls.pc
+%{_mingw32_includedir}/gnutls/
+%{_mingw32_datadir}/aclocal/libgnutls-extra.m4
+%{_mingw32_datadir}/aclocal/libgnutls.m4
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/gnutls.mo
%changelog
-* Wed Sep 24 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.2-1
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-2
+- Rename mingw -> mingw32.
+
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-1
- New native version.
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.1-9
--- /dev/null
+--- gtk+-2.11.1/gtk/gtkentry.c.set-invisible-char-to-bullet 2007-06-04 11:33:19.000000000 -0400
++++ gtk+-2.11.1/gtk/gtkentry.c 2007-06-04 13:52:40.000000000 -0400
+@@ -537,7 +537,7 @@ gtk_entry_class_init (GtkEntryClass *cla
+ g_param_spec_unichar ("invisible-char",
+ P_("Invisible character"),
+ P_("The character to use when masking entry contents (in \"password mode\")"),
+- '*',
++ (gunichar) 0x2022,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+@@ -1101,7 +1101,7 @@ gtk_entry_init (GtkEntry *entry)
+
+ entry->editable = TRUE;
+ entry->visible = TRUE;
+- entry->invisible_char = '*';
++ entry->invisible_char = (gunichar) 0x2022;
+ entry->dnd_position = -1;
+ entry->width_chars = -1;
+ entry->is_cell_renderer = FALSE;
+@@ -4495,7 +4495,7 @@ gtk_entry_get_visibility (GtkEntry *entr
+ * gtk_entry_set_visibility() has been called to set text visibility
+ * to %FALSE. i.e. this is the character used in "password mode" to
+ * show the user how many characters have been typed. The default
+- * invisible char is an asterisk ('*'). If you set the invisible char
++ * invisible char is a small bullet (Unicode character 2022). If you set the invisible char
+ * to 0, then the user will get no feedback at all; there will be
+ * no text on the screen as they type.
+ **/
+++ /dev/null
-%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-gtk2
-Version: 2.14.2
-Release: 1%{?dist}
-Summary: MinGW Windows Gtk2 library
-
-License: LGPLv2+
-Group: Development/Libraries
-URL: http://www.gtk.org
-Source0: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
-Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
-Patch2: gail-leaks.patch
-Patch3: info-leak.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-iconv
-BuildRequires: mingw-gettext
-BuildRequires: mingw-glib2
-BuildRequires: mingw-cairo
-BuildRequires: mingw-jasper
-BuildRequires: mingw-libpng
-BuildRequires: mingw-libjpeg
-BuildRequires: mingw-pango
-BuildRequires: mingw-atk
-BuildRequires: pkgconfig
-# Native one for msgfmt
-BuildRequires: gettext
-# Native one for glib-genmarsjal
-BuildRequires: glib2-devel
-# Native one for gtk-update-icon-cache
-BuildRequires: gtk2
-# Native one for gdk-pixbuf-csource
-BuildRequires: gtk2-devel
-
-Requires(post): wine
-
-
-%description
-MinGW Windows Gtk2 library.
-
-
-%prep
-%setup -q -n gtk+-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-%build
-# Need to run the correct version of glib-mkenums.
-PATH=%{_mingw_bindir}:$PATH
-
-%{_mingw_configure}
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
-
-# Remove manpages which duplicate those in Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-wine %{_mingw_bindir}/gdk-pixbuf-query-loaders.exe \
- > %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-%preun
-rm -f %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-
-%files
-%defattr(-,root,root)
-%{_mingw_datadir}/gtk-doc/html/gail-libgail-util
-%{_mingw_datadir}/gtk-doc/html/gdk-pixbuf
-%{_mingw_datadir}/gtk-doc/html/gdk
-%{_mingw_datadir}/gtk-doc/html/gtk
-%{_mingw_datadir}/locale/*/LC_MESSAGES/gtk20-properties.mo
-%{_mingw_datadir}/locale/*/LC_MESSAGES/gtk20.mo
-%{_mingw_datadir}/themes/*
-%{_mingw_bindir}/gdk-pixbuf-csource.exe
-%{_mingw_bindir}/gdk-pixbuf-query-loaders.exe
-%{_mingw_bindir}/gtk-builder-convert
-%{_mingw_bindir}/gtk-demo.exe
-%{_mingw_bindir}/gtk-query-immodules-2.0.exe
-%{_mingw_bindir}/gtk-update-icon-cache.exe
-%{_mingw_bindir}/libgailutil-18.dll
-%{_mingw_bindir}/libgdk-win32-2.0-0.dll
-%{_mingw_bindir}/libgdk_pixbuf-2.0-0.dll
-%{_mingw_bindir}/libgtk-win32-2.0-0.dll
-%{_mingw_libdir}/gtk-2.0/
-%{_mingw_libdir}/libgailutil.dll.a
-%{_mingw_libdir}/libgailutil.la
-%{_mingw_libdir}/libgdk-win32-2.0.dll.a
-%{_mingw_libdir}/libgdk-win32-2.0.la
-%{_mingw_libdir}/libgdk_pixbuf-2.0.dll.a
-%{_mingw_libdir}/libgdk_pixbuf-2.0.la
-%{_mingw_libdir}/libgtk-win32-2.0.dll.a
-%{_mingw_libdir}/libgtk-win32-2.0.la
-%{_mingw_libdir}/gdk_pixbuf-2.0.def
-%{_mingw_libdir}/gdk-win32-2.0.def
-%{_mingw_libdir}/gtk-win32-2.0.def
-%{_mingw_libdir}/pkgconfig/gail.pc
-%{_mingw_libdir}/pkgconfig/gdk-2.0.pc
-%{_mingw_libdir}/pkgconfig/gdk-win32-2.0.pc
-%{_mingw_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
-%{_mingw_libdir}/pkgconfig/gtk+-2.0.pc
-%{_mingw_libdir}/pkgconfig/gtk+-win32-2.0.pc
-%{_mingw_includedir}/gtk-2.0/
-%{_mingw_includedir}/gail-1.0/
-%{_mingw_sysconfdir}/gtk-2.0/
-%{_mingw_datadir}/aclocal/gtk-2.0.m4
-%{_mingw_datadir}/gtk-2.0/
-
-
-%changelog
-* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.2-1
-- Update to 2.14.2 release
-
-* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-5
-- Remove manpages duplicating those in Fedora native packages.
-
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-4
-- Added dep on pkgconfig, gettext and glib2 (native)
-
-* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-3
-- post/preun scripts to update the gdk-pixbuf.loaders list.
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-2
-- Jasper DLLs now fixed.
-- Fix source URL.
-- Run the correct glib-mkenums.
-
-* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-1
-- Initial RPM release
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-gtk2
+Version: 2.14.2
+Release: 2%{?dist}
+Summary: MinGW Windows Gtk2 library
+
+License: LGPLv2+
+Group: Development/Libraries
+URL: http://www.gtk.org
+Source0: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
+Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
+Patch2: gail-leaks.patch
+Patch3: info-leak.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-glib2
+BuildRequires: mingw32-cairo
+BuildRequires: mingw32-jasper
+BuildRequires: mingw32-libpng
+BuildRequires: mingw32-libjpeg
+BuildRequires: mingw32-pango
+BuildRequires: mingw32-atk
+BuildRequires: pkgconfig
+# Native one for msgfmt
+BuildRequires: gettext
+# Native one for glib-genmarsjal
+BuildRequires: glib2-devel
+# Native one for gtk-update-icon-cache
+BuildRequires: gtk2
+# Native one for gdk-pixbuf-csource
+BuildRequires: gtk2-devel
+
+Requires(post): wine
+
+
+%description
+MinGW Windows Gtk2 library.
+
+
+%prep
+%setup -q -n gtk+-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+# Need to run the correct version of glib-mkenums.
+PATH=%{_mingw32_bindir}:$PATH
+
+%{_mingw32_configure}
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+
+# Remove manpages which duplicate those in Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe \
+ > %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+%preun
+rm -f %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_datadir}/gtk-doc/html/gail-libgail-util
+%{_mingw32_datadir}/gtk-doc/html/gdk-pixbuf
+%{_mingw32_datadir}/gtk-doc/html/gdk
+%{_mingw32_datadir}/gtk-doc/html/gtk
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/gtk20-properties.mo
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/gtk20.mo
+%{_mingw32_datadir}/themes/*
+%{_mingw32_bindir}/gdk-pixbuf-csource.exe
+%{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
+%{_mingw32_bindir}/gtk-builder-convert
+%{_mingw32_bindir}/gtk-demo.exe
+%{_mingw32_bindir}/gtk-query-immodules-2.0.exe
+%{_mingw32_bindir}/gtk-update-icon-cache.exe
+%{_mingw32_bindir}/libgailutil-18.dll
+%{_mingw32_bindir}/libgdk-win32-2.0-0.dll
+%{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
+%{_mingw32_bindir}/libgtk-win32-2.0-0.dll
+%{_mingw32_libdir}/gtk-2.0/
+%{_mingw32_libdir}/libgailutil.dll.a
+%{_mingw32_libdir}/libgailutil.la
+%{_mingw32_libdir}/libgdk-win32-2.0.dll.a
+%{_mingw32_libdir}/libgdk-win32-2.0.la
+%{_mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
+%{_mingw32_libdir}/libgdk_pixbuf-2.0.la
+%{_mingw32_libdir}/libgtk-win32-2.0.dll.a
+%{_mingw32_libdir}/libgtk-win32-2.0.la
+%{_mingw32_libdir}/gdk_pixbuf-2.0.def
+%{_mingw32_libdir}/gdk-win32-2.0.def
+%{_mingw32_libdir}/gtk-win32-2.0.def
+%{_mingw32_libdir}/pkgconfig/gail.pc
+%{_mingw32_libdir}/pkgconfig/gdk-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gtk+-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gtk+-win32-2.0.pc
+%{_mingw32_includedir}/gtk-2.0/
+%{_mingw32_includedir}/gail-1.0/
+%{_mingw32_sysconfdir}/gtk-2.0/
+%{_mingw32_datadir}/aclocal/gtk-2.0.m4
+%{_mingw32_datadir}/gtk-2.0/
+
+
+%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.2-2
+- Rename mingw -> mingw32.
+
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.2-1
+- Update to 2.14.2 release
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-5
+- Remove manpages duplicating those in Fedora native packages.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-4
+- Added dep on pkgconfig, gettext and glib2 (native)
+
+* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-3
+- post/preun scripts to update the gdk-pixbuf.loaders list.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-2
+- Jasper DLLs now fixed.
+- Fix source URL.
+- Run the correct glib-mkenums.
+
+* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-1
+- Initial RPM release
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-iconv
+Name: mingw32-iconv
Version: 1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
%description
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
# Remove documentation which duplicates what is already in
# Fedora native packages.
-rm -rf $RPM_BUILD_ROOT%{_mingw_docdir}/libiconv/
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libiconv/
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/iconv
-%{_mingw_bindir}/libcharset-1.dll
-%{_mingw_bindir}/libiconv-2.dll
-%{_mingw_includedir}/iconv.h
-%{_mingw_includedir}/libcharset.h
-%{_mingw_includedir}/localcharset.h
-%{_mingw_libdir}/charset.alias
-%{_mingw_libdir}/libcharset.a
-%{_mingw_libdir}/libcharset.dll.a
-%{_mingw_libdir}/libcharset.la
-%{_mingw_libdir}/libiconv.dll.a
-%{_mingw_libdir}/libiconv.la
+%{_mingw32_bindir}/iconv
+%{_mingw32_bindir}/libcharset-1.dll
+%{_mingw32_bindir}/libiconv-2.dll
+%{_mingw32_includedir}/iconv.h
+%{_mingw32_includedir}/libcharset.h
+%{_mingw32_includedir}/localcharset.h
+%{_mingw32_libdir}/charset.alias
+%{_mingw32_libdir}/libcharset.a
+%{_mingw32_libdir}/libcharset.dll.a
+%{_mingw32_libdir}/libcharset.la
+%{_mingw32_libdir}/libiconv.dll.a
+%{_mingw32_libdir}/libiconv.la
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-4
+- Rename mingw -> mingw32.
+
* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
- Remove documentation which duplicates what is in Fedora native packages.
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-jasper
+Name: mingw32-jasper
Version: 1.900.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Jasper library
License: JasPer
URL: http://www.ece.uvic.ca/~mdadams/jasper/
Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
Patch1: jasper-1.900.1-sleep.patch
-Patch2: jasper-1.900.1-mingw.patch
+Patch2: jasper-1.900.1-mingw32.patch
Patch3: jasper-1.900.1-enable-shared.patch
Patch4: patch-libjasper-stepsizes-overflow.diff
Group: Development/Libraries
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libjpeg
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libjpeg
BuildRequires: autoconf automake libtool
%description
%build
autoreconf
-%{_mingw_configure} --disable-opengl --enable-libjpeg
+%{_mingw32_configure} --disable-opengl --enable-libjpeg
make
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw_mandir}
+make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir}
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjasper.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjasper.a
%clean
%files
%defattr(-,root,root)
# XXX dlls
-%{_mingw_bindir}/i686-pc-mingw32-imgcmp.exe
-%{_mingw_bindir}/i686-pc-mingw32-imginfo.exe
-%{_mingw_bindir}/i686-pc-mingw32-jasper.exe
-%{_mingw_bindir}/i686-pc-mingw32-tmrdemo.exe
-%{_mingw_bindir}/libjasper-1.dll
-%{_mingw_libdir}/libjasper.dll.a
-%{_mingw_libdir}/libjasper.la
-%{_mingw_includedir}/jasper/
-%{_mingw_mandir}/man1/i686-pc-mingw32-imgcmp.1*
-%{_mingw_mandir}/man1/i686-pc-mingw32-imginfo.1*
-%{_mingw_mandir}/man1/i686-pc-mingw32-jasper.1*
-%{_mingw_mandir}/man1/i686-pc-mingw32-jiv.1*
+%{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe
+%{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe
+%{_mingw32_bindir}/i686-pc-mingw32-jasper.exe
+%{_mingw32_bindir}/i686-pc-mingw32-tmrdemo.exe
+%{_mingw32_bindir}/libjasper-1.dll
+%{_mingw32_libdir}/libjasper.dll.a
+%{_mingw32_libdir}/libjasper.la
+%{_mingw32_includedir}/jasper/
+%{_mingw32_mandir}/man1/i686-pc-mingw32-imgcmp.1*
+%{_mingw32_mandir}/man1/i686-pc-mingw32-imginfo.1*
+%{_mingw32_mandir}/man1/i686-pc-mingw32-jasper.1*
+%{_mingw32_mandir}/man1/i686-pc-mingw32-jiv.1*
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-5
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-4
- Add overflow patch from rawhide
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libgcrypt
+Name: mingw32-libgcrypt
Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows gcrypt encryption library
License: LGPLv2+
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libgpg-error
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libgpg-error
%description
%build
-PATH="%{_mingw_bindir}:$PATH" \
-%{_mingw_configure}
+PATH="%{_mingw32_bindir}:$PATH" \
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
# Remove the static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgcrypt.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgcrypt.a
# Remove info pages which duplicate what is in Fedora natively.
-rm -rf $RPM_BUILD_ROOT%{_mingw_infodir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/dumpsexp.exe
-%{_mingw_bindir}/hmac256.exe
-%{_mingw_bindir}/libgcrypt-11.dll
-%{_mingw_bindir}/libgcrypt-config
-%{_mingw_libdir}/libgcrypt.def
-%{_mingw_libdir}/libgcrypt.dll.a
-%{_mingw_libdir}/libgcrypt.la
-%{_mingw_includedir}/gcrypt-module.h
-%{_mingw_includedir}/gcrypt.h
-%{_mingw_datadir}/aclocal/libgcrypt.m4
+%{_mingw32_bindir}/dumpsexp.exe
+%{_mingw32_bindir}/hmac256.exe
+%{_mingw32_bindir}/libgcrypt-11.dll
+%{_mingw32_bindir}/libgcrypt-config
+%{_mingw32_libdir}/libgcrypt.def
+%{_mingw32_libdir}/libgcrypt.dll.a
+%{_mingw32_libdir}/libgcrypt.la
+%{_mingw32_includedir}/gcrypt-module.h
+%{_mingw32_includedir}/gcrypt.h
+%{_mingw32_datadir}/aclocal/libgcrypt.m4
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.3-2
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.3-1
- Update to 1.4.3 release
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libgpg-error
+Name: mingw32-libgpg-error
Version: 1.6
-Release: 6%{?dist}
+Release: 8%{?dist}
Summary: MinGW Windows GnuPGP error library
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-gettext
+BuildRequires: mingw32-filesystem >= 27
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-gettext
%description
MinGW Windows GnuPGP error library.
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgpg-error.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/gpg-error-config
-%{_mingw_bindir}/gpg-error.exe
-%{_mingw_bindir}/libgpg-error-0.dll
-%{_mingw_libdir}/libgpg-error.dll.a
-%{_mingw_libdir}/libgpg-error.la
-%{_mingw_includedir}/gpg-error.h
-%{_mingw_datadir}/locale/*/LC_MESSAGES/libgpg-error.mo
-%{_mingw_datadir}/aclocal/gpg-error.m4
-%{_mingw_datadir}/common-lisp/source/gpg-error/*
+%{_mingw32_bindir}/gpg-error-config
+%{_mingw32_bindir}/gpg-error.exe
+%{_mingw32_bindir}/libgpg-error-0.dll
+%{_mingw32_libdir}/libgpg-error.dll.a
+%{_mingw32_libdir}/libgpg-error.la
+%{_mingw32_includedir}/gpg-error.h
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/libgpg-error.mo
+%{_mingw32_datadir}/aclocal/gpg-error.m4
+%{_mingw32_datadir}/common-lisp/source/gpg-error/*
%changelog
+* Mon Sep 22 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-8
+- Rename mingw -> mingw32.
+- Depends on mingw-filesystem 27.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.6-6
- Added signature source file & correct URLs
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libjpeg
+Name: mingw32-libjpeg
Version: 6b
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
Patch5: libjpeg-buf-oflo.patch
Patch6: libjpeg-autoconf.patch
-Patch100: jpeg-mingw.patch
+Patch100: jpeg-mingw32.patch
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libpng
-BuildRequires: mingw-zlib
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libpng
+BuildRequires: mingw32-zlib
BuildRequires: autoconf, libtool
%description
autoconf
%build
-%{_mingw_configure} --enable-shared --enable-static
-make libdir=%{_mingw_libdir}
+%{_mingw32_configure} --enable-shared --enable-static
+make libdir=%{_mingw32_libdir}
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_prefix}/man/man1
-make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
+make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjpeg.a
# Remove manual pages which duplicate Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/man
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/cjpeg
-%{_mingw_bindir}/djpeg
-%{_mingw_bindir}/jpegtran
-%{_mingw_bindir}/rdjpgcom
-%{_mingw_bindir}/wrjpgcom
-%{_mingw_bindir}/libjpeg-62.dll
-%{_mingw_includedir}/jconfig.h
-%{_mingw_includedir}/jerror.h
-%{_mingw_includedir}/jmorecfg.h
-%{_mingw_includedir}/jpeglib.h
-%{_mingw_libdir}/libjpeg.dll.a
-%{_mingw_libdir}/libjpeg.la
+%{_mingw32_bindir}/cjpeg
+%{_mingw32_bindir}/djpeg
+%{_mingw32_bindir}/jpegtran
+%{_mingw32_bindir}/rdjpgcom
+%{_mingw32_bindir}/wrjpgcom
+%{_mingw32_bindir}/libjpeg-62.dll
+%{_mingw32_includedir}/jconfig.h
+%{_mingw32_includedir}/jerror.h
+%{_mingw32_includedir}/jmorecfg.h
+%{_mingw32_includedir}/jpeglib.h
+%{_mingw32_libdir}/libjpeg.dll.a
+%{_mingw32_libdir}/libjpeg.la
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 6b-5
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-4
- Switch to tar.bz2 source, and rename configure.in
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libpng
+Name: mingw32-libpng
Version: 1.2.31
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows Libpng library
License: zlib
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-zlib
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-zlib
%description
MinGW Windows Libpng library.
%patch2 -p1
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a
# No need to distribute manpages which appear in the Fedora
# native packages already.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libpng-3.dll
-%{_mingw_bindir}/libpng-config
-%{_mingw_bindir}/libpng12-0.dll
-%{_mingw_bindir}/libpng12-config
-%{_mingw_includedir}/libpng12
-%{_mingw_includedir}/png.h
-%{_mingw_includedir}/pngconf.h
-%{_mingw_libdir}/libpng.dll.a
-%{_mingw_libdir}/libpng.la
-%{_mingw_libdir}/libpng12.a
-%{_mingw_libdir}/libpng12.dll.a
-%{_mingw_libdir}/libpng12.la
-%{_mingw_libdir}/pkgconfig/libpng.pc
-%{_mingw_libdir}/pkgconfig/libpng12.pc
+%{_mingw32_bindir}/libpng-3.dll
+%{_mingw32_bindir}/libpng-config
+%{_mingw32_bindir}/libpng12-0.dll
+%{_mingw32_bindir}/libpng12-config
+%{_mingw32_includedir}/libpng12
+%{_mingw32_includedir}/png.h
+%{_mingw32_includedir}/pngconf.h
+%{_mingw32_libdir}/libpng.dll.a
+%{_mingw32_libdir}/libpng.la
+%{_mingw32_libdir}/libpng12.a
+%{_mingw32_libdir}/libpng12.dll.a
+%{_mingw32_libdir}/libpng12.la
+%{_mingw32_libdir}/pkgconfig/libpng.pc
+%{_mingw32_libdir}/pkgconfig/libpng12.pc
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-5
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-4
- Add patches from rawhide RPM
+++ /dev/null
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index d742c32..23ef050 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
- if (!emulator)
- return -1;
-
-- ADD_ARG_LIT(vm->def->emulator);
-+ ADD_ARG_LIT(emulator);
- ADD_ARG_LIT("-S");
- ADD_ARG_LIT("-M");
- ADD_ARG_LIT(vm->def->os.machine);
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libvirt
-Version: 0.4.5
-Release: 4%{?dist}%{?extra_release}
+Name: mingw32-libvirt
+Version: 0.4.6
+Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows libvirt virtualization library
License: LGPLv2+
Group: Development/Libraries
URL: http://libvirt.org/
Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
-Patch1: libvirt-%{version}-no-emulator-segfault.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-libgpg-error
-BuildRequires: mingw-libgcrypt
-BuildRequires: mingw-gnutls
-BuildRequires: mingw-gettext
-BuildRequires: mingw-libxml2
-BuildRequires: mingw-portablexdr
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-libgpg-error
+BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw32-gnutls
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-libxml2
+BuildRequires: mingw32-portablexdr
BuildRequires: pkgconfig
# Need native version for msgfmt
BuildRequires: gettext
%prep
%setup -q -n libvirt-%{version}
-%patch1 -p1
+
%build
# XXX enable SASL in future
-%{_mingw_configure} \
+%{_mingw32_configure} \
--without-sasl \
--without-avahi \
--without-polkit \
make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/%{_mingw_sysconfdir}/libvirt
-rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/doc/*
-rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_sysconfdir}/libvirt
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/*
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libvirt.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libvirt-0.dll
-%{_mingw_bindir}/virsh.exe
+%{_mingw32_bindir}/libvirt-0.dll
+%{_mingw32_bindir}/virsh.exe
-%{_mingw_libdir}/libvirt.dll.a
-%{_mingw_libdir}/libvirt.la
-%{_mingw_libdir}/pkgconfig/libvirt.pc
+%{_mingw32_libdir}/libvirt.dll.a
+%{_mingw32_libdir}/libvirt.la
+%{_mingw32_libdir}/pkgconfig/libvirt.pc
-%{_mingw_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
-%dir %{_mingw_includedir}/libvirt
-%{_mingw_includedir}/libvirt/libvirt.h
-%{_mingw_includedir}/libvirt/virterror.h
+%dir %{_mingw32_includedir}/libvirt
+%{_mingw32_includedir}/libvirt/libvirt.h
+%{_mingw32_includedir}/libvirt/virterror.h
-%{_mingw_mandir}/man1/virsh.1*
+%{_mingw32_mandir}/man1/virsh.1*
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-1
+- New upstream release 0.4.6.
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-4%{?extra_release}
- Import crash fix from rawhide
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-libxml2
+Name: mingw32-libxml2
Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows libxml2 XML processing library
License: MIT
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-zlib
-BuildRequires: mingw-gettext
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-zlib
+BuildRequires: mingw32-gettext
%description
%build
-LDFLAGS="-no-undefined" %{_mingw_configure} --without-python
+LDFLAGS="-no-undefined" %{_mingw32_configure} --without-python
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libxml2.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.a
# Remove manpages which duplicate Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libxml2-2.dll
-%{_mingw_bindir}/xml2-config
-%{_mingw_bindir}/xmlcatalog.exe
-%{_mingw_bindir}/xmllint.exe
-%{_mingw_libdir}/libxml2.dll.a
-%{_mingw_libdir}/libxml2.la
-%{_mingw_libdir}/pkgconfig
-%{_mingw_libdir}/pkgconfig/libxml-2.0.pc
-%{_mingw_libdir}/xml2Conf.sh
-%{_mingw_includedir}/libxml2
-%{_mingw_datadir}/aclocal/*
-%{_mingw_docdir}/libxml2-%{version}/
-%{_mingw_datadir}/gtk-doc/html/libxml2/
+%{_mingw32_bindir}/libxml2-2.dll
+%{_mingw32_bindir}/xml2-config
+%{_mingw32_bindir}/xmlcatalog.exe
+%{_mingw32_bindir}/xmllint.exe
+%{_mingw32_libdir}/libxml2.dll.a
+%{_mingw32_libdir}/libxml2.la
+%{_mingw32_libdir}/pkgconfig
+%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
+%{_mingw32_libdir}/xml2Conf.sh
+%{_mingw32_includedir}/libxml2
+%{_mingw32_datadir}/aclocal/*
+%{_mingw32_docdir}/libxml2-%{version}/
+%{_mingw32_datadir}/gtk-doc/html/libxml2/
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.1-2
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.7.1-1
- Update to 2.7.1 release
%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System DEBUG_SYMBOLS=1 OPTS=1
-Name: mingw-nsis
+Name: mingw32-nsis
Version: 2.39
Release: 1%{?dist}
Summary: MinGW Windows libxml2 XML processing library
Patch1: nsis-2.39-debian-debug-opt.patch
# This patch is required for NSIS to find the correct cross-compiler.
-Patch2: nsis-2.39-mingw-search.patch
+Patch2: nsis-2.39-mingw32-search.patch
-BuildRequires: mingw-filesystem >= 20
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw32-filesystem >= 20
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
BuildRequires: python
BuildRequires: scons >= 0.96.93
BuildRequires: wxGTK-devel
+++ /dev/null
-%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-pango
-Version: 1.21.6
-Release: 5%{?dist}
-Summary: MinGW Windows Pango library
-
-License: LGPLv2+
-Group: Development/Libraries
-URL: http://www.pango.org
-Source0: http://download.gnome.org/sources/pango/1.21/pango-%{version}.tar.bz2
-# Native pango uses a %post script to generate this, but the pango-querymodules.exe
-# binary is not something we can easily run on a Linux host. We could use wine by
-# wine isn't happy in a mock environment. So we just include a pre-generated copy
-# on basis that it won't ever change much
-Source1: pango.modules
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
-BuildRequires: mingw-iconv
-BuildRequires: mingw-gettext
-BuildRequires: mingw-cairo
-BuildRequires: mingw-freetype
-BuildRequires: mingw-fontconfig
-BuildRequires: mingw-glib2
-BuildRequires: pkgconfig
-
-%description
-MinGW Windows Pango library.
-
-
-%prep
-%setup -q -n pango-%{version}
-
-%build
-# Need to run the correct version of glib-mkenums.
-PATH=%{_mingw_bindir}:$PATH \
-%{_mingw_configure}
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-mkdir -p $RPM_BUILD_ROOT%{_mingw_sysconfdir}/pango/
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw_sysconfdir}/pango/
-
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{_mingw_bindir}/libpango-1.0-0.dll
-%{_mingw_bindir}/libpangocairo-1.0-0.dll
-%{_mingw_bindir}/libpangoft2-1.0-0.dll
-%{_mingw_bindir}/libpangowin32-1.0-0.dll
-%{_mingw_bindir}/pango-querymodules.exe
-%{_mingw_includedir}/pango-1.0/
-%{_mingw_libdir}/libpango-1.0.dll.a
-%{_mingw_libdir}/libpango-1.0.la
-%{_mingw_libdir}/libpangocairo-1.0.dll.a
-%{_mingw_libdir}/libpangocairo-1.0.la
-%{_mingw_libdir}/libpangoft2-1.0.dll.a
-%{_mingw_libdir}/libpangoft2-1.0.la
-%{_mingw_libdir}/libpangowin32-1.0.dll.a
-%{_mingw_libdir}/libpangowin32-1.0.la
-%{_mingw_libdir}/pango-1.0.def
-%{_mingw_libdir}/pangocairo-1.0.def
-%{_mingw_libdir}/pangoft2-1.0.def
-%{_mingw_libdir}/pangowin32-1.0.def
-%{_mingw_libdir}/pango/
-%{_mingw_libdir}/pkgconfig/pango.pc
-%{_mingw_libdir}/pkgconfig/pangocairo.pc
-%{_mingw_libdir}/pkgconfig/pangoft2.pc
-%{_mingw_libdir}/pkgconfig/pangowin32.pc
-%{_mingw_datadir}/gtk-doc/html/pango/
-%{_mingw_mandir}/man1/pango-querymodules.1*
-%{_mingw_sysconfdir}/pango/
-
-
-%changelog
-* Tue Sep 23 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-5
-- Remove use of wine in %post
-
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-4
-- Add dep on pkgconfig
-
-* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-3
-- post/preun scripts to update the pango.modules list.
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-2
-- Run the correct glib-mkenums.
-
-* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-1
-- Initial RPM release
--- /dev/null
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name: mingw32-pango
+Version: 1.21.6
+Release: 6%{?dist}
+Summary: MinGW Windows Pango library
+
+License: LGPLv2+
+Group: Development/Libraries
+URL: http://www.pango.org
+Source0: http://download.gnome.org/sources/pango/1.21/pango-%{version}.tar.bz2
+# Native pango uses a %post script to generate this, but the pango-querymodules.exe
+# binary is not something we can easily run on a Linux host. We could use wine by
+# wine isn't happy in a mock environment. So we just include a pre-generated copy
+# on basis that it won't ever change much
+Source1: pango.modules
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-cairo
+BuildRequires: mingw32-freetype
+BuildRequires: mingw32-fontconfig
+BuildRequires: mingw32-glib2
+BuildRequires: pkgconfig
+
+%description
+MinGW Windows Pango library.
+
+
+%prep
+%setup -q -n pango-%{version}
+
+%build
+# Need to run the correct version of glib-mkenums.
+PATH=%{_mingw32_bindir}:$PATH \
+%{_mingw32_configure}
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/
+
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/libpango-1.0-0.dll
+%{_mingw32_bindir}/libpangocairo-1.0-0.dll
+%{_mingw32_bindir}/libpangoft2-1.0-0.dll
+%{_mingw32_bindir}/libpangowin32-1.0-0.dll
+%{_mingw32_bindir}/pango-querymodules.exe
+%{_mingw32_includedir}/pango-1.0/
+%{_mingw32_libdir}/libpango-1.0.dll.a
+%{_mingw32_libdir}/libpango-1.0.la
+%{_mingw32_libdir}/libpangocairo-1.0.dll.a
+%{_mingw32_libdir}/libpangocairo-1.0.la
+%{_mingw32_libdir}/libpangoft2-1.0.dll.a
+%{_mingw32_libdir}/libpangoft2-1.0.la
+%{_mingw32_libdir}/libpangowin32-1.0.dll.a
+%{_mingw32_libdir}/libpangowin32-1.0.la
+%{_mingw32_libdir}/pango-1.0.def
+%{_mingw32_libdir}/pangocairo-1.0.def
+%{_mingw32_libdir}/pangoft2-1.0.def
+%{_mingw32_libdir}/pangowin32-1.0.def
+%{_mingw32_libdir}/pango/
+%{_mingw32_libdir}/pkgconfig/pango.pc
+%{_mingw32_libdir}/pkgconfig/pangocairo.pc
+%{_mingw32_libdir}/pkgconfig/pangoft2.pc
+%{_mingw32_libdir}/pkgconfig/pangowin32.pc
+%{_mingw32_datadir}/gtk-doc/html/pango/
+%{_mingw32_mandir}/man1/pango-querymodules.1*
+%{_mingw32_sysconfdir}/pango/
+
+
+%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-6
+- Rename mingw -> mingw32.
+
+* Tue Sep 23 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-5
+- Remove use of wine in %post
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-4
+- Add dep on pkgconfig
+
+* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-3
+- post/preun scripts to update the pango.modules list.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-2
+- Run the correct glib-mkenums.
+
+* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-1
+- Initial RPM release
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-pixman
+Name: mingw32-pixman
Version: 0.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Pixman library
License: MIT
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
%description
MinGW Windows Pixman library.
%build
# Uses GTK for its testsuite, so disable this otherwise
# we have a chicken & egg problem on mingw
-%{_mingw_configure} --disable-gtk
+%{_mingw32_configure} --disable-gtk
make
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT/%{_mingw_libdir}/libpixman-1.a
+rm $RPM_BUILD_ROOT/%{_mingw32_libdir}/libpixman-1.a
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libpixman-1-0.dll
-%{_mingw_includedir}/pixman-1
-%{_mingw_libdir}/libpixman-1.dll.a
-%{_mingw_libdir}/libpixman-1.la
-%{_mingw_libdir}/pkgconfig/pixman-1.pc
+%{_mingw32_bindir}/libpixman-1-0.dll
+%{_mingw32_includedir}/pixman-1
+%{_mingw32_libdir}/libpixman-1.dll.a
+%{_mingw32_libdir}/libpixman-1.la
+%{_mingw32_libdir}/pkgconfig/pixman-1.pc
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.12.0-2
+- Rename mingw -> mingw32.
+
* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.12.0-1
- Update to 0.12.0 release
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-portablexdr
+Name: mingw32-portablexdr
Version: 4.0.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW Windows PortableXDR XDR / RPC library
License: LGPLv2+
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
%description
%build
-%{_mingw_configure}
+%{_mingw32_configure}
make
make DESTDIR=$RPM_BUILD_ROOT install
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libportablexdr.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libportablexdr.a
%clean
%files
%defattr(-,root,root)
-%{_mingw_bindir}/libportablexdr-0.dll
-%{_mingw_libdir}/libportablexdr.dll.a
-%{_mingw_libdir}/libportablexdr.la
-%{_mingw_includedir}/rpc
+%{_mingw32_bindir}/libportablexdr-0.dll
+%{_mingw32_libdir}/libportablexdr.dll.a
+%{_mingw32_libdir}/libportablexdr.la
+%{_mingw32_includedir}/rpc
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.10-5
+- Rename mingw -> mingw32.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.10-4
- Remove static library.
-
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
-Name: mingw-zlib
+Name: mingw32-zlib
Version: 1.2.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 23
-BuildRequires: mingw-gcc
-BuildRequires: mingw-binutils
+BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
-# For some reason mingw-find-provides doesn't get this.
-Provides: mingw(zlib1.dll)
+## For some reason mingw32-find-provides doesn't get this.
+#Provides: mingw32(zlib1.dll)
%description
MinGW Windows zlib compression library.
%build
-CC=%{_mingw_cc} \
-CFLAGS="%{_mingw_cflags}" \
-RANLIB=%{_mingw_ranlib} \
+CC=%{_mingw32_cc} \
+CFLAGS="%{_mingw32_cflags}" \
+RANLIB=%{_mingw32_ranlib} \
./configure
make -f win32/Makefile.gcc \
- CC=%{_mingw_cc} \
- AR=%{_mingw_ar} \
+ CC=%{_mingw32_cc} \
+ AR=%{_mingw32_ar} \
RC=i686-pc-mingw32-windres \
DLLWRAP=i686-pc-mingw32-dllwrap \
- STRIP=%{_mingw_strip} \
+ STRIP=%{_mingw32_strip} \
all
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
make -f win32/Makefile.gcc \
- INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
- LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw_libdir} \
- BINARY_PATH=$RPM_BUILD_ROOT%{_mingw_bindir} \
+ INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw32_includedir} \
+ LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw32_libdir} \
+ BINARY_PATH=$RPM_BUILD_ROOT%{_mingw32_bindir} \
install
# .dll.a file is misnamed for some reason - fix that.
-mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
- $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll.a
+mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \
+ $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a
%clean
%files
%defattr(-,root,root)
-%{_mingw_includedir}/zconf.h
-%{_mingw_includedir}/zlib.h
-%{_mingw_libdir}/libz.dll.a
-%{_mingw_bindir}/zlib1.dll
+%{_mingw32_includedir}/zconf.h
+%{_mingw32_includedir}/zlib.h
+%{_mingw32_libdir}/libz.dll.a
+%{_mingw32_bindir}/zlib1.dll
%changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-9
+- Rename mingw -> mingw32.
+
* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
- Remove manpage.
git.annexia.org / fedora-mingw.git / commitdiff