[gtkpod] 2.1.3, drop vendor tag.

[Jon Ciesla]

commit 9276a335a95e2de039e76a1fabdf22b110ae3c92
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Feb 11 10:26:52 2013 -0600

    2.1.3, drop vendor tag.

 .gitignore          |    1 +
 gtkpod-gdl362.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 gtkpod.spec         |   16 +++++++++++-----
 sources             |    2 +-
 4 files changed, 57 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9851b81..0ae2601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gtkpod-1.0.0.tar.gz
 /gtkpod-2.1.0.tar.gz
 /gtkpod-2.1.1.tar.gz
 /gtkpod-2.1.2.tar.gz
+/gtkpod-2.1.3.tar.gz
diff --git a/gtkpod-gdl362.patch b/gtkpod-gdl362.patch
new file mode 100644
index 0000000..b794fa1
--- /dev/null
+++ b/gtkpod-gdl362.patch
@@ -0,0 +1,44 @@
+Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c
+===================================================================
+--- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c
++++ gtkpod-2.1.2/src/anjuta-action-callbacks.c
+@@ -65,7 +65,7 @@ void
+ on_layout_lock_toggle (GtkAction *action, AnjutaApp *app)
+ {
+ 	if (app->layout_manager)
+-		g_object_set (app->layout_manager->master, "locked",
++		g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked",
+ 					  gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
+ 					  NULL);
+ }
+Index: gtkpod-2.1.2/src/anjuta-app.c
+===================================================================
+--- gtkpod-2.1.2.orig/src/anjuta-app.c
++++ gtkpod-2.1.2/src/anjuta-app.c
+@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin
+     else if (g_strcmp0(pr_style, "Tabs") == 0)
+         style = GDL_SWITCHER_STYLE_TABS;
+ 
+-    g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL);
++    g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL);
+     g_free(pr_style);
+ }
+ 
+@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj
+     gtk_widget_show(app->dock);
+     gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0);
+ 
+-    dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock));
++    dockbar = gdl_dock_bar_new(G_OBJECT(app->dock));
+     gtk_widget_show(dockbar);
+     gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+ 
+-    app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock));
++    app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock));
+     g_signal_connect (app->layout_manager, "notify::dirty",
+             G_CALLBACK (on_layout_dirty_notify), app);
+-    g_signal_connect (app->layout_manager->master, "notify::locked",
++    g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked",
+             G_CALLBACK (on_layout_locked_notify), app);
+ 
+     /* UI engine */
diff --git a/gtkpod.spec b/gtkpod.spec
index 4a70ce9..ece4ae2 100644
--- a/gtkpod.spec
+++ b/gtkpod.spec
@@ -1,6 +1,6 @@
 Name:           gtkpod
-Version:        2.1.2
-Release:        2%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
@@ -10,7 +10,8 @@ URL:            http://www.gtkpod.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Don't use -DGTK_DISABLE_DEPRECATED until https://bugzilla.redhat.com/show_bug.cgi?id=734605 is fixed
 #Patch0:         gtkpod-2.1.0-no-gtk-disable-deprecated.patch
-Patch1:		gtkpod-2.1.2-anjuta.patch
+#Patch1:		gtkpod-2.1.2-anjuta.patch
+Patch2:		gtkpod-gdl362.patch
 
 BuildRequires:  gtk3-devel
 BuildRequires:  curl-devel
@@ -50,7 +51,8 @@ developing extensions for gtkpod.
 %prep
 %setup -q
 #%patch0 -p1 -b .no-gtk-disable-deprecated
-%patch1 -p0 -b .anjuta
+#%patch1 -p0 -b .anjuta
+%patch2 -p1 -b .gdl
 
 %build
 %configure --disable-static
@@ -60,7 +62,6 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 desktop-file-install \
-    --vendor fedora \
     --delete-original \
     --dir %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -109,6 +110,11 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 11 2013 Jon Ciesla <limburgher at gmail.com> - 2.1.3-1
+- Latest upstream.
+- Anjuta patch upstreamed.
+- Drop desktop vendor tag.
+
 * Wed Sep 26 2012 Kalev Lember <kalevlember at gmail.com> - 2.1.2-2
 - Rebuilt for libgdl soname bump
 
diff --git a/sources b/sources
index 3c22003..a9e0376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88fef3f947cbb7ae6b714080733a3b6b  gtkpod-2.1.2.tar.gz
+57f04578de6e3262a436ec574422b144  gtkpod-2.1.3.tar.gz