From 0505a3be945ed57b740ecd6af154ac0892bc5699 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 15 Nov 2011 08:44:11 +0000
Subject: [PATCH 1/5] Accepting request 91049 from home:dimstar:GNOME:Next

Pushing current Gnome 3.3 work to G:F... some work might be lumpy...

OBS-URL: https://build.opensuse.org/request/show/91049
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=110
---
 anjuta-3.2.1.tar.bz2 | 3 ---
 anjuta-3.3.1.tar.bz2 | 3 +++
 anjuta.changes       | 7 +++++++
 anjuta.spec          | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 anjuta-3.2.1.tar.bz2
 create mode 100644 anjuta-3.3.1.tar.bz2

diff --git a/anjuta-3.2.1.tar.bz2 b/anjuta-3.2.1.tar.bz2
deleted file mode 100644
index bec9d1f..0000000
--- a/anjuta-3.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f165d5d2dac001267d6fef0a0249c3fad1881a50c596a33e9aaee78469378cbb
-size 7672745
diff --git a/anjuta-3.3.1.tar.bz2 b/anjuta-3.3.1.tar.bz2
new file mode 100644
index 0000000..15dc0c0
--- /dev/null
+++ b/anjuta-3.3.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f424fe7d71b2a62667f5b994bc789236ae4b047227c08e018d7deaf47801b49
+size 7686467
diff --git a/anjuta.changes b/anjuta.changes
index ac8b3f0..cea98eb 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 26 19:26:57 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.1:
+  + bgo#659563:	Bookmarks reset to position 1 after file changed
+    on FS.
+
 -------------------------------------------------------------------
 Wed Oct 19 13:31:31 UTC 2011 - dimstar@opensuse.org
 
diff --git a/anjuta.spec b/anjuta.spec
index 2ef2f8e..a922d95 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -18,13 +18,13 @@
 
 
 Name:           anjuta
-Version:        3.2.1
+Version:        3.3.1
 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.2/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/anjuta/3.3/%{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 BuildRequires:  autogen
 BuildRequires:  binutils-devel

From 65172244b3ec61f3001ef6ad07b27f956a26ef16 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 15 Nov 2011 08:46:45 +0000
Subject: [PATCH 2/5] Accepting request 91436 from
 home:vuntz:branches:GNOME:Factory

Fix .changes

OBS-URL: https://build.opensuse.org/request/show/91436
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=111
---
 anjuta.changes | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/anjuta.changes b/anjuta.changes
index cea98eb..de66d98 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -2,8 +2,9 @@
 Wed Oct 26 19:26:57 UTC 2011 - dimstar@opensuse.org
 
 - Update to version 3.3.1:
-  + bgo#659563:	Bookmarks reset to position 1 after file changed
-    on FS.
+  + Integrate fixes from 3.2.1.
+  + Bugs fixed: bgo#610371, bgo#633284, bgo#653274, bgo#659563,
+    bgo#662526.
 
 -------------------------------------------------------------------
 Wed Oct 19 13:31:31 UTC 2011 - dimstar@opensuse.org

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 3/5] 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

From 531fc586d80700c724bfdd95e11cfa490b60663b Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 12 Dec 2011 15:57:02 +0000
Subject: [PATCH 4/5] Accepting request 96132 from
 home:dimstar:branches:GNOME:Factory

Push typelib change branch

OBS-URL: https://build.opensuse.org/request/show/96132
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=113
---
 anjuta.changes |  5 +++++
 anjuta.spec    | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/anjuta.changes b/anjuta.changes
index cadc7dc..88ad093 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  9 10:41:46 UTC 2011 - dimstar@opensuse.org
+
+- Split typelib files to typelib-1_0-Anjuta-3_0.
+
 -------------------------------------------------------------------
 Sat Nov 26 12:44:34 UTC 2011 - dimstar@opensuse.org
 
diff --git a/anjuta.spec b/anjuta.spec
index 2f6a3dd..5eacbb4 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -101,6 +101,19 @@ an integrated Valgrind memory profiler, an integrated gprof performance
 profiler, a class generator, a powerful source editor, source browsing,
 and more.
 
+%package -n typelib-1_0-Anjuta-3_0
+Summary:        Libraries for developing Anjuta plugins
+Group:          System/Libraries
+
+%description -n typelib-1_0-Anjuta-3_0
+Anjuta is a versatile Integrated Development Environment (IDE) for the
+GNOME desktop. It features a number of advanced programming facilities
+includes project management, application wizards, an interactive
+debugger, an integrated Glade UI designer, integrated Devhelp API help,
+an integrated Valgrind memory profiler, an integrated gprof performance
+profiler, a class generator, a powerful source editor, source browsing,
+and more.
+
 %package -n glade-catalog-anjuta
 License:        GPLv2+
 Summary:        Versatile Integrated Development Environment for GNOME -- Catalog for Glade
@@ -126,6 +139,7 @@ License:        GPLv2+
 Summary:        Libraries for developing Anjuta plugins -- Development Files
 Group:          Development/Tools/IDE
 Requires:       libanjuta-3-0 = %{version}
+Requires:       typelib-1_0-Anjuta-3_0 = %{version}
 Provides:       %{name}-doc = %{version}
 Obsoletes:      %{name}-doc < %{version}
 
@@ -226,6 +240,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files -n libanjuta-3-0
 %defattr(-, root, root)
 %{_libdir}/libanjuta-3.so.*
+
+%files -n typelib-1_0-Anjuta-3_0
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Anjuta-3.0.typelib
 %{_libdir}/girepository-1.0/IAnjuta-3.0.typelib
 

From f3c270615f273a23ef6a552f0e0652cab84623d2 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 21 Dec 2011 05:08:55 +0000
Subject: [PATCH 5/5] Accepting request 97465 from
 home:vuntz:branches:GNOME:Factory

Update to 3.3.3

OBS-URL: https://build.opensuse.org/request/show/97465
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=114
---
 anjuta-3.3.2.tar.xz                    |  3 ---
 anjuta-3.3.3.tar.xz                    |  3 +++
 anjuta.changes                         | 23 ++++++++++++++++++++--
 anjuta.spec                            | 27 ++++++++------------------
 gnome-shell-extension-template.tar.bz2 |  3 ---
 5 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 anjuta-3.3.2.tar.xz
 create mode 100644 anjuta-3.3.3.tar.xz
 delete mode 100644 gnome-shell-extension-template.tar.bz2

diff --git a/anjuta-3.3.2.tar.xz b/anjuta-3.3.2.tar.xz
deleted file mode 100644
index f010158..0000000
--- a/anjuta-3.3.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:059932b235876ea293f9fdc9e6dc7896b8169852144d36e49a2f006105b338a7
-size 5817308
diff --git a/anjuta-3.3.3.tar.xz b/anjuta-3.3.3.tar.xz
new file mode 100644
index 0000000..584c74a
--- /dev/null
+++ b/anjuta-3.3.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc9d6ebc81c709b4d9042927b4b9902cf3d483dcbfcaacd76a95238b5dc61a08
+size 5914248
diff --git a/anjuta.changes b/anjuta.changes
index 88ad093..a6c7acb 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,15 +1,34 @@
+-------------------------------------------------------------------
+Tue Dec 20 23:11:52 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.3.3:
+  + Fix various crashes (including bgo#665082, rh#532290,
+    rh#757236).
+  + Several improvements to git support.
+  + Several improvements to vala support.
+  + Fix memory leaks.
+  + Ship files missing in 3.3.2.
+  + Various other code changes.
+  + Other bugs fixed: bgo#641079, bgo#646695, bgo#656761,
+    bgo#666321, bgo#666336, bgo#666448, bgo#666482.
+  + Updated translations.
+- Drop gnome-shell-extension-template.tar.bz2: the files are in
+  the tarball now.
+
 -------------------------------------------------------------------
 Fri Dec  9 10:41:46 UTC 2011 - dimstar@opensuse.org
 
-- Split typelib files to typelib-1_0-Anjuta-3_0.
+- Split typelib files into typelib-1_0-Anjuta-3_0 subpackage.
+- Add typelib-1_0-Anjuta-3_0 Requires to devel subpackage.
 
 -------------------------------------------------------------------
 Sat Nov 26 12:44:34 UTC 2011 - dimstar@opensuse.org
 
 - Update to version 3.3.2:
+  + Add template for Gnome Shell Extension (bgo#661299).
   + Bugs fixed: bgo#648934, bgo#662526, bgo#663016, bgo#663385,
     bgo#664058, bgo#664263, bgo#645212, bgo#629769, bgo#658788,
-    bgo#661299, bgo#662960.
+    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
diff --git a/anjuta.spec b/anjuta.spec
index 5eacbb4..c90b43e 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -16,17 +16,14 @@
 #
 
 
-
 Name:           anjuta
-Version:        3.3.2
-Release:        1
-License:        GPLv2+
+Version:        3.3.3
+Release:        0
 Summary:        Versatile Integrated Development Environment for GNOME
-Url:            http://anjuta.sourceforge.net/
+License:        GPL-2.0+
 Group:          Development/Tools/IDE
+Url:            http://anjuta.sourceforge.net/
 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
@@ -88,7 +85,6 @@ profiler, a class generator, a powerful source editor, source browsing,
 and more.
 
 %package -n libanjuta-3-0
-License:        GPLv2+
 Summary:        Libraries for developing Anjuta plugins
 Group:          System/Libraries
 
@@ -102,7 +98,7 @@ profiler, a class generator, a powerful source editor, source browsing,
 and more.
 
 %package -n typelib-1_0-Anjuta-3_0
-Summary:        Libraries for developing Anjuta plugins
+Summary:        Libraries for developing Anjuta plugins -- Introspection bindings
 Group:          System/Libraries
 
 %description -n typelib-1_0-Anjuta-3_0
@@ -114,8 +110,10 @@ an integrated Valgrind memory profiler, an integrated gprof performance
 profiler, a class generator, a powerful source editor, source browsing,
 and more.
 
+This package provides the GObject Introspection bindings for the Anjuta
+library to develop plugins.
+
 %package -n glade-catalog-anjuta
-License:        GPLv2+
 Summary:        Versatile Integrated Development Environment for GNOME -- Catalog for Glade
 Group:          Development/Tools/GUI Builders
 Requires:       %{name} = %{version}
@@ -135,7 +133,6 @@ This package provides a catalog for Glade, to allow the use the Anjuta
 widgets in Glade.
 
 %package devel
-License:        GPLv2+
 Summary:        Libraries for developing Anjuta plugins -- Development Files
 Group:          Development/Tools/IDE
 Requires:       libanjuta-3-0 = %{version}
@@ -155,14 +152,6 @@ 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
deleted file mode 100644
index ec2042f..0000000
--- a/gnome-shell-extension-template.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7af103e43474e22829d8e9f3c6ce7885f53a7da80cdd79cb7570332fbdaca7d
-size 1220