rpms/bisho/devel bisho-fixgconfschemas.patch, NONE, 1.1 bisho.spec, 1.4, 1.5

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28738

Modified Files:
	bisho.spec 
Added Files:
	bisho-fixgconfschemas.patch 
Log Message:
- Add upstream patch for gconf schema name

bisho-fixgconfschemas.patch:
 .gitignore       |    2 +-
 configure.ac     |    2 +-
 data/Makefile.am |    2 +-
 po/POTFILES.skip |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE bisho-fixgconfschemas.patch ---
>From f2e377d084a2c6fc70a366ac902d8b148dd64cf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross at linux.intel.com>
Date: Wed, 12 Aug 2009 10:22:48 +0000
Subject: Rename callback.schemas to bisho.schemas

---
diff --git a/.gitignore b/.gitignore
index f11e96d..2947ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ po/Makefile*
 po/POTFILES
 po/stamp-it
 data/bisho.desktop
-data/callback.schemas
+data/bisho.schemas
 po/.intltool-merge-cache
 src/bisho
 src/bisho-url-callback
diff --git a/configure.ac b/configure.ac
index 0a12209..2654203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AM_GCONF_SOURCE_2
 AC_OUTPUT([
         Makefile
         data/Makefile
-        data/callback.schemas
+        data/bisho.schemas
         src/Makefile
         po/Makefile.in
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7680af0..4a7f8da 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 dist_icon_DATA = bisho.png
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = callback.schemas
+schema_DATA = bisho.schemas
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
diff --git a/data/callback.schemas.in b/data/bisho.schemas.in
index 7cb9229..7cb9229 100644
--- a/data/callback.schemas.in
+++ b/data/bisho.schemas.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 69175a0..07ee4c1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/callback.schemas.in
+data/bisho.schemas.in
--
cgit v0.8.2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bisho.spec	23 Aug 2009 11:41:21 -0000	1.4
+++ bisho.spec	31 Aug 2009 16:39:00 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           bisho
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:		bisho-fixgconfschemas.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
@@ -32,6 +33,8 @@ aggregation service.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixgconfschemas
+mv  $RPM_BUILD_DIR/%{name}-%{version}/data/callback.schemas.in $RPM_BUILD_DIR/%{name}-%{version}/data/bisho.schemas.in
 
 # Don't run configure from autogen.sh
 sed -i 's|echo|exit 0|g' autogen.sh
@@ -86,11 +89,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS TODO
 %{_bindir}/bisho
-%{_sysconfdir}/gconf/schemas/callback.schemas
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-3
+- Add upstream patch for gconf schema name
+
 * Sun Aug 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-2
 - Add missing dep for new release