From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 13 Aug 2013 15:21:17 +0000 (-0400)
Subject: add .gbs.conf and update to 2.36.4
X-Git-Tag: accepted/tizen/common/20141126.220152~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2a5c266e8e6986ff65cc6268fb7911ad46a4bbc;p=platform%2Fupstream%2Fglib.git

add .gbs.conf and update to 2.36.4

Change-Id: I0540f90b0b0ba28680cd5ae1d5186d07be078e61
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---

diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644
index 0000000..fa9fdc5
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,3 @@
+[general]
+upstream_branch = upstream
+upstream_tag = ${upstreamversion}
diff --git a/packaging/glib2.changes b/packaging/glib2.changes
index b37fe75..806157b 100644
--- a/packaging/glib2.changes
+++ b/packaging/glib2.changes
@@ -1,5 +1,9 @@
+* Tue Aug 13 2013 Anas Nashif <anas.nashif@intel.com> 2.36.3@0540f90
+- add .gbs.conf and update to 2.36.4
+
 * Tue Aug 13 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.095512@84a55be
 - Remove empty docs package
+
 * Fri Jul 19 2013 Philippe Coval <philippe.coval@eurogiciel.fr> accepted/tizen/20130710.220535@5c863cc
 - gdesktopappinfo: Allow getting the desktop ID from the filename
   Bug-Tizen: TZPC-3317 (... remove the fav apps icon ...)
diff --git a/packaging/glib2.spec b/packaging/glib2.spec
index 669b7ba..3e9191e 100644
--- a/packaging/glib2.spec
+++ b/packaging/glib2.spec
@@ -2,12 +2,12 @@
 %define keepstatic 1
 
 Name:           glib2
-Version:        2.36.1
+Version:        2.36.4
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1+
-Group:          System/Libraries
+Group:          Base/Libraries
 Url:            http://www.gtk.org/
 Source:         http://download.gnome.org/sources/glib/2.32/%{name}-%{version}.tar.xz
 Source1:        glib2.sh
@@ -44,7 +44,6 @@ a main loop abstraction, and so on.
 
 %package tools
 Summary:        General-Purpose Utility Library -- Tools
-Group:          Development/Libraries
 
 %description tools
 GLib is a general-purpose utility library, which provides many useful
@@ -53,7 +52,6 @@ a main loop abstraction, and so on.
 
 %package -n gio-branding-upstream
 Summary:        Upstream definitions of default settings and applications
-Group:          System/Libraries
 Requires:       libgio = %{version}
 Provides:       %{name}-branding-upstream = %{version}
 Obsoletes:      %{name}-branding-upstream < %{version}
@@ -93,7 +91,6 @@ Requires:       python-xml
 Provides:       glib2-doc = 2.19.6
 Obsoletes:      glib2-doc < 2.19.6
 Summary:        General-Purpose Utility Library -- Development Files
-Group:          Development/Libraries
 
 %description devel
 GLib is a general-purpose utility library, which provides many useful
@@ -105,7 +102,6 @@ This package contains the development files for GLib.
 %package devel-static
 Requires:       %{name}-devel = %{version}
 Summary:        General-Purpose Utility Library -- Static Libraries
-Group:          Development/Libraries
 
 %description devel-static
 GLib is a general-purpose utility library, which provides many useful
@@ -116,7 +112,6 @@ This package contains static versions of the GLib libraries.
 
 %package -n libglib
 Summary:        General-Purpose Utility Library
-Group:          System/Libraries
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 
@@ -127,7 +122,6 @@ a main loop abstraction, and so on.
 
 %package -n libgmodule
 Summary:        General-Purpose Utility Library -- Library for Modules
-Group:          System/Libraries
 
 %description -n libgmodule
 GLib is a general-purpose utility library, which provides many useful
@@ -139,7 +133,6 @@ object files (commonly known as 'plug-ins').
 
 %package -n libgio
 Summary:        General-Purpose Utility Library -- Library for VFS
-Group:          System/Libraries
 Requires:       gio-branding = %{version}
 # bnc#555605: shared-mime-info is required by libgio to properly detect mime types.
 Requires:       shared-mime-info
@@ -157,7 +150,6 @@ GIO provides a modern, easy-to-use VFS API.
 
 %package -n libgthread
 Summary:        General-Purpose Utility Library -- Library for Threads
-Group:          System/Libraries
 
 %description -n libgthread
 GLib is a general-purpose utility library, which provides many useful
@@ -169,7 +161,6 @@ software.
 
 %package -n libgobject
 Summary:        General-Purpose Utility Library -- Object-Oriented Framework for C
-Group:          System/Libraries
 
 %description -n libgobject
 GLib is a general-purpose utility library, which provides many useful