From 60619cc6bfad7254846a22485d03f70f4346bb14d62f498747ced90868cc49cb Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 14 Dec 2010 18:24:05 +0000
Subject: [PATCH] Accepting request 56002 from
 home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/56002
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=122
---
 _service      | 11 -----------
 glib2.changes |  7 ++++---
 glib2.spec    |  6 +++---
 3 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 _service

diff --git a/_service b/_service
deleted file mode 100644
index 2a3b8f0..0000000
--- a/_service
+++ /dev/null
@@ -1,11 +0,0 @@
-<services>
-  <service name="tar_scm">
-   <param name="versionprefix">2.27.4git</param>
-   <param name="url">git://git.gnome.org/glib</param>
-   <param name="scm">git</param>
-</service>
-<service name="recompress">
-  <param name="file">*.tar</param>
-  <param name="compression">bz2</param>
-</service>
-<service name="set_version"/></services>
diff --git a/glib2.changes b/glib2.changes
index f2e7ea7..c87b81e 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -2,9 +2,10 @@
 Fri Dec 10 12:53:06 UTC 2010 - fcrozat@novell.com
 
 - Add support for source service checkout, with %BUILD_FROM_VCS:
- + Add git-core and gtk-doc BuildRequires
- + Enforce gtk-doc html generation
- + Generate ChangeLog
+ + Add git-core and gtk-doc BuildRequires.
+ + Add call to ./autogen.sh.
+ + Enforce gtk-doc html generation with --enable-gtk-doc.
+ + Generate ChangeLog since we ship it.
 
 -------------------------------------------------------------------
 Mon Dec 6 21:03:22 UTC 2010 - awafaa@opensuse.org
diff --git a/glib2.spec b/glib2.spec
index 6fafb5b..0f494b4 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -62,6 +62,8 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libpcre)
 %if 0%{?BUILD_FROM_VCS}
+# It's important to keep those BuildRequires inside
+# BUILD_FROM_VCS to avoid build loops in Factory
 BuildRequires:  git-core
 BuildRequires:  gtk-doc
 %endif
@@ -251,7 +253,6 @@ cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
     cp -a %{S:6} m4macros/
 fi
-
 %if 0%{?BUILD_FROM_VCS}
 NOCONFIGURE=1 ./autogen.sh
 %endif
@@ -269,9 +270,8 @@ NOCONFIGURE=1 ./autogen.sh
 %endif
     --with-runtime-libdir=../../%{_lib}
 %{__make} %{?_smp_mflags}
-
 %if 0%{?BUILD_FROM_VCS}
-NOCONFIGURE=1 %{__make} ChangeLog
+%{__make} ChangeLog
 %endif
 
 %check