[glabels] Add patch to fix child schemas in the gschema.xml file. (Bug #795241)

Peter Gordon pgordon at fedoraproject.org
Tue Feb 21 00:35:43 UTC 2012


commit e8c2f44f794b180e3f5a94012ff099d7b6673639
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Mon Feb 20 16:35:24 2012 -0800

    Add patch to fix child schemas in the gschema.xml file. (Bug #795241)

 glabels-fix-child-schemas.patch |   18 ++++++++++++++++++
 glabels.spec                    |   10 +++++++++-
 2 files changed, 27 insertions(+), 1 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 f9ab271..d1f97fa 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	3.0.0
-Release:	13%{?dist}
+Release:	14%{?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.
@@ -83,6 +85,7 @@ This package contains the template database for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-child-schemas
 
 
 %build
@@ -164,6 +167,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
 
 
 %changelog
+* Mon Feb 20 2012 Peter Gordon <peter at thecodergeek.com> - 3.0.0-14
+- Add patch to fix child schemas in the gschema.xml file:
+  + fix-child-schemas.patch
+- Resolves: #795241 (glabels has invalid schema file)
+
 * Wed Jan 04 2012 Peter Gordon <peter at thecodergeek.com> - 3.0.0-13
 - Rebuild for GCC 4.7
 


More information about the scm-commits mailing list