[mingw-glib-networking: 4/13] Update to 2.30.1

epienbro epienbro at fedoraproject.org
Tue Mar 6 19:55:37 UTC 2012


commit 445424722a824b951280fea84fc2ecb4b0b9e494
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Oct 18 20:16:16 2011 +0300

    Update to 2.30.1
    
    - Added a patch to fix build without gnome-proxy

 .gitignore                                         |    1 +
 ...-Only-build-the-test-if-we-are-building-g.patch |   31 ++++++++++++++++++++
 mingw32-glib-networking.spec                       |    9 +++++-
 sources                                            |    2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49af4e1..c0a6aaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /glib-networking-2.28.6.1.tar.bz2
 /glib-networking-2.30.0.tar.xz
+/glib-networking-2.30.1.tar.xz
diff --git a/0001-proxy-gnome-Only-build-the-test-if-we-are-building-g.patch b/0001-proxy-gnome-Only-build-the-test-if-we-are-building-g.patch
new file mode 100644
index 0000000..ca736d4
--- /dev/null
+++ b/0001-proxy-gnome-Only-build-the-test-if-we-are-building-g.patch
@@ -0,0 +1,31 @@
+From b46ee18dce0dcf417b443d780444081cf239c0c5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Tue, 18 Oct 2011 14:33:45 +0300
+Subject: [PATCH] proxy/gnome: Only build the test if we are building gnome
+ proxy support
+
+Fixes the build with mingw32.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662085
+---
+ proxy/tests/Makefile.am |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am
+index a1e69bd..e2d05d3 100644
+--- a/proxy/tests/Makefile.am
++++ b/proxy/tests/Makefile.am
+@@ -14,6 +14,9 @@ noinst_PROGRAMS = $(TEST_PROGS)
+ LDADD  = \
+ 	$(GLIB_LIBS)
+ 
++if HAVE_GNOME_PROXY
++TEST_PROGS += gnome
++endif
++
+ TEST_PROGS +=		\
+-	gnome		\
+ 	$(NULL)
+-- 
+1.7.6.4
+
diff --git a/mingw32-glib-networking.spec b/mingw32-glib-networking.spec
index 3aadab3..ccd6d81 100644
--- a/mingw32-glib-networking.spec
+++ b/mingw32-glib-networking.spec
@@ -6,7 +6,7 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw32-glib-networking
-Version:        2.30.0
+Version:        2.30.1
 Release:        1%{?dist}
 Summary:        MinGW Windows glib-networking library
 
@@ -14,6 +14,8 @@ License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gnome.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glib-networking/%{release_version}/glib-networking-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=662085
+Patch0:         0001-proxy-gnome-Only-build-the-test-if-we-are-building-g.patch
 
 BuildArch:      noarch
 
@@ -34,6 +36,7 @@ This package contains modules that extend the networking support in GIO.
 
 %prep
 %setup -q -n glib-networking-%{version}
+%patch0 -p1 -b .gnome_proxy
 
 
 %build
@@ -56,6 +59,10 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gio/modules/*.la
 
 
 %changelog
+* Tue Oct 18 2011 Kalev Lember <kalevlember at gmail.com> - 2.30.1-1
+- Update to 2.30.1
+- Added a patch to fix build without gnome-proxy
+
 * Sun Oct 02 2011 Kalev Lember <kalevlember at gmail.com> - 2.30.0-1
 - Update to 2.30.0
 - Use automatic mingw dep extraction
diff --git a/sources b/sources
index 4758536..8ec9a09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a147c0d5aced1ba0fcc1feea53873a52  glib-networking-2.30.0.tar.xz
+a93b7344daf6292ea66f7a6ec21f361d  glib-networking-2.30.1.tar.xz


More information about the scm-commits mailing list