rpms/mingw32-gtk2/devel .cvsignore, 1.4, 1.5 gdk-pixbuf.loaders, 1.1, 1.2 mingw32-gtk2.spec, 1.6, 1.7 sources, 1.4, 1.5 double-browser.patch, 1.1, NONE
Erik van Pienbroek
epienbro at fedoraproject.org
Wed Jun 10 19:57:31 UTC 2009
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19152
Modified Files:
.cvsignore gdk-pixbuf.loaders mingw32-gtk2.spec sources
Removed Files:
double-browser.patch
Log Message:
- Update to 2.17.1
- Use %%global instead of %%define
- The -static subpackage was missing a Group: declaration
- Drop upstreamed patch
- Add BR: mingw32-libtiff
- Updated the gdk-pixbuf.loaders file for libtiff support
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 18 Apr 2009 19:13:56 -0000 1.4
+++ .cvsignore 10 Jun 2009 19:57:01 -0000 1.5
@@ -1 +1 @@
-gtk+-2.16.1.tar.bz2
+gtk+-2.17.1.tar.bz2
Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/gdk-pixbuf.loaders,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdk-pixbuf.loaders 11 Feb 2009 10:09:35 -0000 1.1
+++ gdk-pixbuf.loaders 10 Jun 2009 19:57:01 -0000 1.2
@@ -1,52 +1,41 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.14.2
+# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.17.1
#
# LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
#
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
-"emf" 4 "gtk20" "The EMF image format" "LGPL"
-"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
-"emf" ""
-"\001" "" 100
-
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
"ani" 4 "gtk20" "The ANI image format" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"bmp" 5 "gtk20" "The BMP image format" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" " z " 100
+"II* " " z" 100
+"II* \020 CR\002 " " z zzz z" 0
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
-"gif" 5 "gtk20" "The GIF image format" "LGPL"
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"gif" 4 "gtk20" "The GIF image format" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
-"xbm" 4 "gtk20" "The XBM image format" "LGPL"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
-"wmf" 4 "gtk20" "The WMF image format" "LGPL"
-"image/x-wmf" ""
-"wmf" "apm" ""
-"\327\315\306\232" "" 100
-"\001" "" 100
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"ico" 5 "gtk20" "The ICO image format" "LGPL"
+"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
+"ico" "cur" ""
+" \001 " "zz znz" 100
+" \002 " "zz znz" 100
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
"tga" 4 "gtk20" "The Targa image format" "LGPL"
@@ -59,6 +48,40 @@
" \n" "xz " 100
" \013" "xz " 100
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+" " "zz" 1
+" `" "z " 1
+" @" "z " 1
+" " "z " 1
+
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format" "LGPL"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gtk20" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+" jP" "!!!! " 100
+"\377O\377Q" "" 100
+
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
"pcx" 4 "gtk20" "The PCX image format" "LGPL"
"image/x-pcx" ""
@@ -69,25 +92,11 @@
"\n\004\001" "" 100
"\n\005\001" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-" jP" "!!!! " 100
-"\377O\377Q" "" 100
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
-"tiff" 5 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" " z " 100
-"II* " " z" 100
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
@@ -100,37 +109,16 @@
"P5" "" 100
"P6" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
-"wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-" " "zz" 1
-" `" "z " 1
-" @" "z " 1
-" " "z " 1
-
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
"image/x-cmu-raster" "image/x-sun-raster" ""
"ras" ""
"Y\246j\225" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
-"ico" 4 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" ""
-"ico" "cur" ""
-" \001 " "zz znz" 100
-" \002 " "zz znz" 100
+"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"xbm" 4 "gtk20" "The XBM image format" "LGPL"
+"image/x-xbitmap" ""
+"xbm" ""
+"#define " "" 100
+"/*" "" 50
Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-gtk2.spec 22 May 2009 10:05:17 -0000 1.6
+++ mingw32-gtk2.spec 10 Jun 2009 19:57:01 -0000 1.7
@@ -1,18 +1,18 @@
-%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-gtk2
-Version: 2.16.1
-Release: 2%{?dist}
+Version: 2.17.1
+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.15/gtk+-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,9 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
# wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
Source1: gdk-pixbuf.loaders
-# Don't open double browser windows from about dialog
-Patch0: double-browser.patch
-
# Fix use of extended buttons in gtkstatusicon.
Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch
@@ -44,6 +41,7 @@ BuildRequires: mingw32-iconv
BuildRequires: mingw32-jasper
BuildRequires: mingw32-libjpeg
BuildRequires: mingw32-libpng >= 1.2.2
+BuildRequires: mingw32-libtiff
BuildRequires: mingw32-pango >= 1.20.0
BuildRequires: mingw32-pixman
BuildRequires: mingw32-zlib
@@ -74,6 +72,7 @@ MinGW Windows Gtk2 library.
%package static
Summary: Static version of the MinGW Windows Gtk2 library
Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
%description static
Static version of the MinGW Windows Gtk2 library.
@@ -82,7 +81,6 @@ Static version of the MinGW Windows Gtk2
%prep
%setup -q -n gtk+-%{version}
-%patch0 -p1
%patch1000 -p1
%patch1001 -p0
@@ -96,7 +94,7 @@ libtoolize
# Need to run the correct version of glib-mkenums.
PATH=%{_mingw32_bindir}:$PATH
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --without-libtiff
+%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus
make %{?_smp_mflags}
@@ -250,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
@@ -316,12 +317,21 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
%{_mingw32_libdir}/gtk-2.0/modules/libgail.a
%changelog
+* Wed Jun 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.1-1
+- Update to 2.17.1
+- Use %%global instead of %%define
+- The -static subpackage was missing a Group: declaration
+- Drop upstreamed patch
+- Add BR: mingw32-libtiff
+- Updated the gdk-pixbuf.loaders file for libtiff support
+
* Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.1-2
- don't open double browser windows from about dialogs
(patch is from the native gtk2 package)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 18 Apr 2009 19:13:56 -0000 1.4
+++ sources 10 Jun 2009 19:57:01 -0000 1.5
@@ -1 +1 @@
-74e35ff3e6e02c960fe2117a4b6b102f gtk+-2.16.1.tar.bz2
+ba8f8bf549be224b124a9efa745d9240 gtk+-2.17.1.tar.bz2
--- double-browser.patch DELETED ---
More information about the fedora-extras-commits
mailing list