Author: epienbro Update of /cvs/pkgs/rpms/mingw32-glib2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820 Modified Files: mingw32-glib2.spec Removed Files: glib-i386-atomic.patch Log Message: - Update to 2.21.1 - Use %global instead of %define - Dropped the glib-i386-atomic.patch as it doesn't have any effect (the mingw32 toolchain is called i686-pc-mingw32, not i386-pc-mingw32) Index: mingw32-glib2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mingw32-glib2.spec 16 Apr 2009 12:15:13 -0000 1.6 +++ mingw32-glib2.spec 10 Jun 2009 19:34:14 -0000 1.7 @@ -1,24 +1,22 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-glib2 -Version: 2.20.1 +Version: 2.21.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.20/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Patch0: glib-i386-atomic.patch - BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils @@ -32,9 +30,6 @@ BuildRequires: gettext # Native version required for glib-genmarshal BuildRequires: glib2-devel -# These are required for the glib-i386-atomic patch. -BuildRequires: autoconf, automake, libtool, gettext-devel, gtk-doc - Requires: pkgconfig @@ -49,13 +44,9 @@ Group: Development/Libraries %description static Static version of the MinGW Windows GLib2 library. + %prep %setup -q -n glib-%{version} -%patch0 -p1 -b .i386-atomic - -# Required for the glib-i386-atomic patch. -libtoolize --force --copy -autoreconf %build @@ -73,6 +64,7 @@ pushd build_shared make %{?_smp_mflags} popd + %install rm -rf $RPM_BUILD_ROOT @@ -178,7 +170,14 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgobject-2.0.a %{_mingw32_libdir}/libgthread-2.0.a + %changelog +* Wed Jun 10 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org&gt; - 2.21.1-1 +- Update to 2.21.1 +- Use %%global instead of %%define +- Dropped the glib-i386-atomic.patch as it doesn't have any effect (the mingw32 + toolchain is called i686-pc-mingw32, not i386-pc-mingw32) + * Thu Apr 16 2009 Thomas Sailer <t.sailer(a)alumni.ethz.ch&gt; - 2.20.1-1 - Update to 2.20.1 --- glib-i386-atomic.patch DELETED ---