[mingw-glib2] Drop two patches that have been fixed upstream

Kalev Lember kalev at fedoraproject.org
Fri Mar 29 14:39:46 UTC 2013


commit dc9652df2681e2707601423c07d519eabe72c644
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Mar 29 15:18:27 2013 +0100

    Drop two patches that have been fixed upstream

 ...rt-a-DBus-server-when-built-as-static-lib.patch |   58 --------------------
 glib-build-dbus-proxy-testcase-only-on-unix.patch  |   36 ------------
 mingw-glib2.spec                                   |   18 ++-----
 3 files changed, 4 insertions(+), 108 deletions(-)
---
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index a101b12..bb75e96 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-glib2
 Version:        2.36.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -35,18 +35,9 @@ BuildRequires:  gettext
 # Native version required for glib-genmarshal
 BuildRequires:  glib2-devel >= 2.31.20
 
-# Needed for patch2
-BuildRequires:  autoconf automake libtool
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=675516
-Patch0:         0001-Don-t-start-a-DBus-server-when-built-as-static-lib.patch
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=674214
 Patch1:         0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=684145
-Patch2:         glib-build-dbus-proxy-testcase-only-on-unix.patch
-
 # By default g_log_default_handler always assumes that stdout and stderr
 # are file descriptors 1 and 2. On Win32 this isn't always the case as the
 # win32 API function AttachConsole can be used to dynamically attach GUI
@@ -104,15 +95,11 @@ Static version of the MinGW Windows GLib2 library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
 
-autoreconf -i --force
-
 
 %build
 #GLib can't build static and shared libraries in one go, so we build GLib twice
@@ -290,6 +277,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Fri Mar 29 2013 Kalev Lember <kalevlember at gmail.com> - 2.36.0-2
+- Drop two patches that have been fixed upstream
+
 * Tue Mar 26 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.36.0-1
 - Update to 2.36.0
 


More information about the scm-commits mailing list