From 7b57d4476fcce43718fa2be694ac4bd657d12549 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 28 Nov 2011 08:15:28 +0000
Subject: [PATCH] Accepting request 93902 from
 home:dimstar:branches:GNOME:Factory

Update to 3.3.2 - with hack for gnome-shell-extensions template missing

OBS-URL: https://build.opensuse.org/request/show/93902
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=112
---
 anjuta-3.3.1.tar.bz2                   |  3 ---
 anjuta-3.3.2.tar.xz                    |  3 +++
 anjuta.changes                         | 13 +++++++++++++
 anjuta.spec                            | 18 +++++++++++++++---
 gnome-shell-extension-template.tar.bz2 |  3 +++
 5 files changed, 34 insertions(+), 6 deletions(-)
 delete mode 100644 anjuta-3.3.1.tar.bz2
 create mode 100644 anjuta-3.3.2.tar.xz
 create mode 100644 gnome-shell-extension-template.tar.bz2

diff --git a/anjuta-3.3.1.tar.bz2 b/anjuta-3.3.1.tar.bz2
deleted file mode 100644
index 15dc0c0..0000000
--- a/anjuta-3.3.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f424fe7d71b2a62667f5b994bc789236ae4b047227c08e018d7deaf47801b49
-size 7686467
diff --git a/anjuta-3.3.2.tar.xz b/anjuta-3.3.2.tar.xz
new file mode 100644
index 0000000..f010158
--- /dev/null
+++ b/anjuta-3.3.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:059932b235876ea293f9fdc9e6dc7896b8169852144d36e49a2f006105b338a7
+size 5817308
diff --git a/anjuta.changes b/anjuta.changes
index de66d98..cadc7dc 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Nov 26 12:44:34 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.2:
+  + Bugs fixed: bgo#648934, bgo#662526, bgo#663016, bgo#663385,
+    bgo#664058, bgo#664263, bgo#645212, bgo#629769, bgo#658788,
+    bgo#661299, bgo#662960.
+- Inject gnome-shell-extension-template.tar.bz2 into build system,
+  as the tarball misses those files. See bgo#664829.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+
 -------------------------------------------------------------------
 Wed Oct 26 19:26:57 UTC 2011 - dimstar@opensuse.org
 
diff --git a/anjuta.spec b/anjuta.spec
index a922d95..2f6a3dd 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -18,14 +18,16 @@
 
 
 Name:           anjuta
-Version:        3.3.1
+Version:        3.3.2
 Release:        1
 License:        GPLv2+
 Summary:        Versatile Integrated Development Environment for GNOME
 Url:            http://anjuta.sourceforge.net/
 Group:          Development/Tools/IDE
-Source:         http://download.gnome.org/sources/anjuta/3.3/%{name}-%{version}.tar.bz2
-Source1:        %{name}-rpmlintrc
+Source:         http://download.gnome.org/sources/anjuta/3.3/%{name}-%{version}.tar.xz
+# bgo#664829 - The tarball is missing a bunch of files for gnome-shell-extensions template.
+Source1:        gnome-shell-extension-template.tar.bz2
+Source99:       %{name}-rpmlintrc
 BuildRequires:  autogen
 BuildRequires:  binutils-devel
 BuildRequires:  bison
@@ -48,6 +50,8 @@ BuildRequires:  update-desktop-files
 %ifnarch ia64 s390 s390x
 BuildRequires:  valgrind-devel
 %endif
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gdl-3.0)
 BuildRequires:  pkgconfig(gladeui-2.0)
@@ -137,6 +141,14 @@ and more.
 %lang_package
 %prep
 %setup -q
+if [ -f plugins/project-wizard/templates/gnome-shell-extension/autogen.sh ]; then
+  echo "plugins/project-wizard/templates/gnome-shell-extension/autogen.sh is part of the tarball again. Drop Source1 and this hack"
+  /bin/false
+else
+  pushd plugins/project-wizard/templates/gnome-shell-extension
+  tar xf %{S:1}
+popd
+fi
 translation-update-upstream
 
 %build
diff --git a/gnome-shell-extension-template.tar.bz2 b/gnome-shell-extension-template.tar.bz2
new file mode 100644
index 0000000..ec2042f
--- /dev/null
+++ b/gnome-shell-extension-template.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7af103e43474e22829d8e9f3c6ce7885f53a7da80cdd79cb7570332fbdaca7d
+size 1220