rpms/mingw32-gtk2/devel mingw32-gtk2-enable_static_build.patch, 1.1, 1.2 mingw32-gtk2.spec, 1.26, 1.27

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12088

Modified Files:
	mingw32-gtk2-enable_static_build.patch mingw32-gtk2.spec 
Log Message:
Dropped the autoreconf call


mingw32-gtk2-enable_static_build.patch:
 configure    |   14 --------------
 configure.in |   20 ++++++++++----------
 2 files changed, 10 insertions(+), 24 deletions(-)

Index: mingw32-gtk2-enable_static_build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2-enable_static_build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-gtk2-enable_static_build.patch	8 Mar 2009 20:52:18 -0000	1.1
+++ mingw32-gtk2-enable_static_build.patch	2 Dec 2009 11:59:11 -0000	1.2
@@ -27,3 +27,26 @@
  
  AC_LIBTOOL_WIN32_DLL
  AM_PROG_LIBTOOL
+--- configure.orig	2009-12-02 12:33:12.670948100 +0100
++++ configure	2009-12-02 12:33:55.898932594 +0100
+@@ -4993,20 +4993,6 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-
+-if test "$os_win32" = "yes"; then
+-  if test x$enable_static = xyes -o x$enable_static = x; then
+-    { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
+-    enable_static=no
+-  fi
+-  if test x$enable_shared = xno; then
+-    { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
+-  fi
+-  enable_shared=yes
+-fi
+-
+ enable_win32_dll=yes
+ 
+ case $host in


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mingw32-gtk2.spec	2 Dec 2009 11:14:05 -0000	1.26
+++ mingw32-gtk2.spec	2 Dec 2009 11:59:11 -0000	1.27
@@ -64,12 +64,6 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
-# These are required for the static library patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  gtk-doc
-
 Requires:       pkgconfig
 
 
@@ -96,11 +90,6 @@ Static version of the MinGW Windows Gtk2
 %patch1001 -p0
 %patch1002 -p0
 
-# Regenerate the configure script
-aclocal
-autoreconf
-libtoolize
-
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -354,6 +343,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.1-1
 - Update to 2.19.1
+- Dropped the autoreconf call
 
 * Sun Nov 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.0-1
 - Update to 2.19.0