[glabels/f15] Sync fixes from F16 branch.

[Peter Gordon]

commit f736c5412ad98df8b4d7ee0df00105efeaa84f67
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Tue Jun 12 23:07:23 2012 -0700

    Sync fixes from F16 branch.

 glabels-fix-child-schemas.patch |   18 ++++++++++++++++++
 glabels.spec                    |   19 ++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/glabels-fix-child-schemas.patch b/glabels-fix-child-schemas.patch
new file mode 100644
index 0000000..8dc0840
--- /dev/null
+++ b/glabels-fix-child-schemas.patch
@@ -0,0 +1,18 @@
+diff -up ./data/schemas/org.gnome.glabels-3.gschema.xml.in.in.orig ./data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+--- ./data/schemas/org.gnome.glabels-3.gschema.xml.in.in.orig	2012-02-20 16:12:41.219710462 -0800
++++ ./data/schemas/org.gnome.glabels-3.gschema.xml.in.in	2012-02-20 16:12:47.806691976 -0800
+@@ -2,10 +2,10 @@
+ 
+ 
+   <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
+-    <child name="ui" schema="org.gnome.glabels.ui"/>
+-    <child name="locale" schema="org.gnome.glabels.locale"/>
+-    <child name="objects" schema="org.gnome.glabels.objects"/>
+-    <child name="history" schema="org.gnome.glabels.history"/>
++    <child name="ui" schema="org.gnome.glabels-3.ui"/>
++    <child name="locale" schema="org.gnome.glabels-3.locale"/>
++    <child name="objects" schema="org.gnome.glabels-3.objects"/>
++    <child name="history" schema="org.gnome.glabels-3.history"/>
+   </schema>
+ 
+ 
diff --git a/glabels.spec b/glabels.spec
index ba3c817..3778f3d 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	3.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -9,6 +9,8 @@ URL:		http://www.glabels.org
 
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glabels/3.0/glabels-%{version}.tar.bz2
 
+Patch0: 	%{name}-fix-child-schemas.patch
+
 ## TODO: GNU Barcode unfortunately only provides a static library at this
 ##       time. If/when Barcode provides a shared library in the future, we'll
 ##       use that package here instead of barcode-static.
@@ -44,7 +46,7 @@ supply stores.
 Summary:	Development files and documentation for %{name}
 License:	LGPLv3+
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description	devel
 This package contains the header files and development documentation for
@@ -83,6 +85,7 @@ This package contains the template database for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-child-schemas
 
 
 %build
@@ -132,7 +135,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
 
 %files	devel
 %doc AUTHORS COPYING-LIBS
-%doc %{_datadir}/gtk-doc/html/libglabels-3.0/
 %{_includedir}/libglabels-3.0/
 %{_includedir}/libglbarcode-3.0/
 %{_libdir}/libglabels-3.0.so
@@ -164,6 +166,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
 
 
 %changelog
+* Tue Jun 12 2012 Peter Gordon <peter at thecodergeek.com> - 3.0.0-2
+- Sync changes and fixes from F16:
+- Fix %%doc files conflict between the glabels-devel and glabels-doc
+  subpackages.
+- Resolves: #831384 (glabels-devel-3.0.0-14.fc17.i686 doc file conflict)
+- Add patch to fix child schemas in the gschema.xml file:
+  + fix-child-schemas.patch
+- Resolves: #795241 (glabels has invalid schema file)
+- Make the glabels-devel subpackage dependency on glabels-libs be
+  arch-specific, in accordance with updated packaging guidelines.
+
 * Mon Jun 20 2011 Peter Gordon <peter at thecodergeek.com>
 - Switch BuildRequires barcode-devel to barcode-static, since GNU Barcode
   provides only a static library to build against. This is to comply with the