rpms/avant-window-navigator/F-8 avant-window-navigator-schemas.patch, NONE, 1.1 avant-window-navigator.spec, 1.8, 1.9
Sindre Pedersen Bjørdal (sindrepb)
fedora-extras-commits at redhat.com
Sun Aug 3 14:55:52 UTC 2008
- Previous message (by thread): rpms/avant-window-navigator/F-9 avant-window-navigator-schemas.patch, NONE, 1.1 avant-window-navigator.spec, 1.16, 1.17
- Next message (by thread): rpms/gyachi/EL-5 .cvsignore, 1.5, 1.6 gyachi.spec, 1.13, 1.14 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sindrepb
Update of /cvs/pkgs/rpms/avant-window-navigator/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11418
Modified Files:
avant-window-navigator.spec
Added Files:
avant-window-navigator-schemas.patch
Log Message:
fix schemas generation script
avant-window-navigator-schemas.patch:
--- NEW FILE avant-window-navigator-schemas.patch ---
diff -up avant-window-navigator-0.2.6/data/awn-schema-to-gconf.orig avant-window-navigator-0.2.6/data/awn-schema-to-gconf
--- avant-window-navigator-0.2.6/data/awn-schema-to-gconf.orig 2008-08-03 16:37:54.000000000 +0200
+++ avant-window-navigator-0.2.6/data/awn-schema-to-gconf 2008-08-03 16:38:31.000000000 +0200
@@ -66,12 +66,14 @@ def main(argv):
ET.SubElement(schema_element, 'owner').text = 'avant-window-navigator'
key_type = in_schema.get(key, 'type')
element_type = ET.SubElement(schema_element, 'type')
+ value = in_schema.get(key, 'default')
if key_type.startswith('list-'):
element_type.text = 'list'
ET.SubElement(schema_element, 'list_type').text = key_type[5:]
+ value = '[%s]' % value.replace(';', ',')
else:
element_type.text = key_type
- ET.SubElement(schema_element, 'default').text = in_schema.get(key, 'default')
+ ET.SubElement(schema_element, 'default').text = value
locale = ET.SubElement(schema_element, 'locale')
locale.set('name', 'C')
ET.SubElement(locale, 'short')
Index: avant-window-navigator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/F-8/avant-window-navigator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- avant-window-navigator.spec 22 Mar 2008 16:38:24 -0000 1.8
+++ avant-window-navigator.spec 3 Aug 2008 14:55:22 -0000 1.9
@@ -2,7 +2,7 @@
Name: avant-window-navigator
Version: 0.2.6
-Release: 8%{?dist}
+Release: 9%{?dist}
Provides: avant-window-navigator-python = %{version}-%{release}
Obsoletes: avant-window-navigator-python < 0.2.6-3
@@ -14,6 +14,9 @@
License: GPLv2+ and LGPLv2+
URL: https://launchpad.net/awn
Source0: https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar.gz
+#fixes schemas file
+Patch0: avant-window-navigator-schemas.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +46,7 @@
%prep
%setup -q
+%patch0 -p1
#fix permissions
chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.h
@@ -51,13 +55,13 @@
%build
-%configure --disable-static
+%configure --disable-static --disable-schemas
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+export GCONF_DISABLE_MAKEFILE_ _INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
@@ -101,6 +105,7 @@
%{_sysconfdir}/gconf/schemas/awn.schemas > /dev/null || :
fi
+
%postun
/sbin/ldconfig
@@ -136,6 +141,9 @@
%changelog
+* Sun Aug 03 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.6-9
+- Add patch to fix empty string in schemas file. #457683
+
* Sat Mar 22 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.6-8
- Add missing pyxdg requires
- Previous message (by thread): rpms/avant-window-navigator/F-9 avant-window-navigator-schemas.patch, NONE, 1.1 avant-window-navigator.spec, 1.16, 1.17
- Next message (by thread): rpms/gyachi/EL-5 .cvsignore, 1.5, 1.6 gyachi.spec, 1.13, 1.14 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list