From 9ea0a7522fb801bdc89afc00f341ac5e60a4b9abccb26709d9285f2e765fd09e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sun, 1 Apr 2012 09:47:43 +0000
Subject: [PATCH] Accepting request 111931 from
 home:vuntz:branches:GNOME:Factory

Update to 3.4.1

OBS-URL: https://build.opensuse.org/request/show/111931
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=73
---
 gdl-3.4.0.tar.xz    |  3 ---
 gdl-3.4.1.tar.xz    |  3 +++
 gdl-soversion.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 gdl.changes         |  9 +++++++++
 gdl.spec            | 17 ++++++++++-------
 5 files changed, 63 insertions(+), 10 deletions(-)
 delete mode 100644 gdl-3.4.0.tar.xz
 create mode 100644 gdl-3.4.1.tar.xz
 create mode 100644 gdl-soversion.patch

diff --git a/gdl-3.4.0.tar.xz b/gdl-3.4.0.tar.xz
deleted file mode 100644
index 08c616d..0000000
--- a/gdl-3.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea9c196800658c5ab0fb5705da7efb403e6f498c4f9105cb60ee3d47bc38d098
-size 522848
diff --git a/gdl-3.4.1.tar.xz b/gdl-3.4.1.tar.xz
new file mode 100644
index 0000000..07e11ca
--- /dev/null
+++ b/gdl-3.4.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82fedce869a40d36394faa441472318746f7431ae051d99ada6df206ba027f5e
+size 522772
diff --git a/gdl-soversion.patch b/gdl-soversion.patch
new file mode 100644
index 0000000..af25abc
--- /dev/null
+++ b/gdl-soversion.patch
@@ -0,0 +1,41 @@
+From 89c38d17f7fee7ca9065715b5825f18fd63e8ac1 Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs@gnome.org>
+Date: Thu, 29 Mar 2012 05:47:57 +0000
+Subject: Really fixed so name this time...
+
+---
+diff --git a/configure.in b/configure.in
+index d97768e..f4f49ca 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,12 +19,12 @@ GDL_CURRENT=2
+ 
+ dnl increment any time the source changes; set to
+ dnl  0 if you increment CURRENT
+-GDL_REVISION=0
++GDL_REVISION=1
+ 
+ dnl increment if any interfaces have been added; set to 0
+ dnl  if any interfaces have been changed or removed. removal has
+ dnl  precedence over adding, so set to 0 if both happened.
+-GDL_AGE=1
++GDL_AGE=0
+ 
+ AC_SUBST(GDL_CURRENT)
+ AC_SUBST(GDL_REVISION)
+--
+cgit v0.9.0.2
+--- a/configure
++++ b/configure
+@@ -19,9 +19,9 @@ GDL_CURRENT=2
+ 
+ GDL_CURRENT=2
+ 
+-GDL_REVISION=0
++GDL_REVISION=1
+ 
+-GDL_AGE=1
++GDL_AGE=0
+ 
+ 
+ 
diff --git a/gdl.changes b/gdl.changes
index 6827027..8bda282 100644
--- a/gdl.changes
+++ b/gdl.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 30 06:50:58 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.4.1:
+  + Fix shared library name.
+- Add gdl-soversion.patch: additional fix for soversion, taken from
+  git.
+- Rename libgdl-3-3 back to libgdl-3-2 now that soversion is fixed.
+
 -------------------------------------------------------------------
 Tue Mar 27 06:27:00 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gdl.spec b/gdl.spec
index e1bcc34..7dc9208 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -17,13 +17,15 @@
 
 
 Name:           gdl
-Version:        3.4.0
+Version:        3.4.1
 Release:        0
 Summary:        Gnome Devtool Libraries
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://ftp.gnome.org/pub/GNOME/sources/gdl/0.7/
 Source:         http://download.gnome.org/sources/gdl/3.4/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gdl-soversion.patch vuntz@opensuse.org -- Taken from git, fix soversion of library
+Patch0:         gdl-soversion.patch
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk3-devel
@@ -37,14 +39,14 @@ Gnome Devtool Libraries contains components and libraries that are
 intended to be shared between GNOME development tools, including
 gnome-debug, gnome-build, and anjuta2.
 
-%package -n libgdl-3-3
+%package -n libgdl-3-2
 Summary:        Gnome Devtool Libraries
 Group:          System/Libraries
 Recommends:     %{name}-lang
 Provides:       gdl = %{version}
 Obsoletes:      gdl < %{version}
 
-%description -n libgdl-3-3
+%description -n libgdl-3-2
 Gnome Devtool Libraries contains components and libraries that are
 intended to be shared between GNOME development tools, including
 gnome-debug, gnome-build, and anjuta2.
@@ -63,7 +65,7 @@ This package provides the GObject Introspection bindings for GDL.
 %package devel
 Summary:        Gnome Devtool Libraries -- Development Files
 Group:          Development/Libraries/GNOME
-Requires:       libgdl-3-3 = %{version}
+Requires:       libgdl-3-2 = %{version}
 Requires:       typelib-1_0-Gdl-3 = %{version}
 
 %description devel
@@ -75,6 +77,7 @@ gnome-debug, gnome-build, and anjuta2.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
 %configure
@@ -86,14 +89,14 @@ rm %{buildroot}%{_libdir}/*.la
 %find_lang %{name}-3
 %fdupes -s %{buildroot}
 
-%post -n libgdl-3-3 -p /sbin/ldconfig
+%post -n libgdl-3-2 -p /sbin/ldconfig
 
-%postun -n libgdl-3-3 -p /sbin/ldconfig
+%postun -n libgdl-3-2 -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
 
-%files -n libgdl-3-3
+%files -n libgdl-3-2
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*