From ecb519cfb0eaa335bf4b4ee7660b70b0a8ee07ae Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 21 Feb 2011 15:11:51 +0000 Subject: [PATCH 1/7] Update to 0.1.7 --- .gitignore | 1 + gsettings-desktop-schemas.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d52ae35..613d03a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2 /gsettings-desktop-schemas-0.1.3.tar.bz2 /gsettings-desktop-schemas-0.1.4.tar.bz2 /gsettings-desktop-schemas-0.1.5.tar.bz2 +/gsettings-desktop-schemas-0.1.7.tar.bz2 diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 0b49ac5..a46b10c 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas -Version: 0.1.5 -Release: 3%{?dist} +Version: 0.1.7 +Release: 1%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -43,6 +43,7 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%find_lang %{name} --with-gnome %posttrans glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : @@ -53,7 +54,7 @@ if [ $1 -eq 0 ]; then fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING MAINTAINERS NEWS README %{_datadir}/glib-2.0/schemas/* @@ -68,6 +69,9 @@ fi %changelog +* Mon Feb 21 2011 Bastien Nocera 0.1.7-1 +- Update to 0.1.7 + * Thu Feb 10 2011 Matthias Clasen - 0.1.5-3 - Rebuild diff --git a/sources b/sources index 4177c9c..47275f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2057d807143caa2d72454b2c97856988 gsettings-desktop-schemas-0.1.5.tar.bz2 +c838d059136132a2c0b1cf1602d6e92f gsettings-desktop-schemas-0.1.7.tar.bz2 From 447e55e2ed9574ac0c419cff5009fd5de8238f03 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 24 Feb 2011 16:22:06 -0500 Subject: [PATCH 2/7] Add patch from git to disable a11y by default; it makes gnome-shell totally unusable right now --- ...ble-toolkit-accessibility-by-default.patch | 27 +++++++++++++++++++ gsettings-desktop-schemas.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-schemas-Disable-toolkit-accessibility-by-default.patch diff --git a/0001-schemas-Disable-toolkit-accessibility-by-default.patch b/0001-schemas-Disable-toolkit-accessibility-by-default.patch new file mode 100644 index 0000000..15e9eb4 --- /dev/null +++ b/0001-schemas-Disable-toolkit-accessibility-by-default.patch @@ -0,0 +1,27 @@ +From 6dc7e92795ec4dc6032bda35790e2713eecc654f Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 24 Feb 2011 02:21:36 +0000 +Subject: [PATCH] schemas: Disable toolkit-accessibility by default + +As it will get enabled if any of the screen reader or on screen-keyboard +are enabled. +--- + .../org.gnome.desktop.interface.gschema.xml.in.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in.in b/schemas/org.gnome.desktop.interface.gschema.xml.in.in +index 43fee28..c6a09f1 100644 +--- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in ++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in +@@ -1,7 +1,7 @@ + + + +- true ++ false + <_summary>Enable Toolkit Accessibility + <_description> + Whether toolkits should load accessibility related modules. +-- +1.7.4.1 + diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index a46b10c..54778b6 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas Version: 0.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -16,6 +16,8 @@ BuildRequires: intltool Requires: glib2 >= 2.25.11 +# From upstream git +Patch0: 0001-schemas-Disable-toolkit-accessibility-by-default.patch %description gsettings-desktop-schemas contains a collection of GSettings schemas for @@ -33,6 +35,7 @@ and header files for developing applications that use %{name}. %prep %setup -q +%patch0 -p1 %build @@ -69,6 +72,10 @@ fi %changelog +* Thu Feb 24 2011 Colin Walters - 0.1.7-2 +- Add patch from git to disable a11y by default; it makes + gnome-shell totally unusable right now + * Mon Feb 21 2011 Bastien Nocera 0.1.7-1 - Update to 0.1.7 From 8284ba27990af1d7bc7bd5b8e1ffc61fed1e063c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 8 Mar 2011 08:25:18 +0000 Subject: [PATCH 3/7] Update to 2.91.91 --- ...ble-toolkit-accessibility-by-default.patch | 27 ------------------- gsettings-desktop-schemas.spec | 11 ++++---- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 0001-schemas-Disable-toolkit-accessibility-by-default.patch diff --git a/0001-schemas-Disable-toolkit-accessibility-by-default.patch b/0001-schemas-Disable-toolkit-accessibility-by-default.patch deleted file mode 100644 index 15e9eb4..0000000 --- a/0001-schemas-Disable-toolkit-accessibility-by-default.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6dc7e92795ec4dc6032bda35790e2713eecc654f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 24 Feb 2011 02:21:36 +0000 -Subject: [PATCH] schemas: Disable toolkit-accessibility by default - -As it will get enabled if any of the screen reader or on screen-keyboard -are enabled. ---- - .../org.gnome.desktop.interface.gschema.xml.in.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in.in b/schemas/org.gnome.desktop.interface.gschema.xml.in.in -index 43fee28..c6a09f1 100644 ---- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in -+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in -@@ -1,7 +1,7 @@ - - - -- true -+ false - <_summary>Enable Toolkit Accessibility - <_description> - Whether toolkits should load accessibility related modules. --- -1.7.4.1 - diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 54778b6..7bc46cd 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas -Version: 0.1.7 -Release: 2%{?dist} +Version: 2.91.91 +Release: 1%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -16,9 +16,6 @@ BuildRequires: intltool Requires: glib2 >= 2.25.11 -# From upstream git -Patch0: 0001-schemas-Disable-toolkit-accessibility-by-default.patch - %description gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. @@ -35,7 +32,6 @@ and header files for developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %build @@ -72,6 +68,9 @@ fi %changelog +* Tue Mar 08 2011 Bastien Nocera 2.91.91-1 +- Update to 2.91.91 + * Thu Feb 24 2011 Colin Walters - 0.1.7-2 - Add patch from git to disable a11y by default; it makes gnome-shell totally unusable right now From 157ce581f646d8dbc85847c799a98ba8558e66c0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 8 Mar 2011 08:31:35 +0000 Subject: [PATCH 4/7] Fix sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 613d03a..4f8180a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2 /gsettings-desktop-schemas-0.1.4.tar.bz2 /gsettings-desktop-schemas-0.1.5.tar.bz2 /gsettings-desktop-schemas-0.1.7.tar.bz2 +/gsettings-desktop-schemas-2.91.91.tar.bz2 diff --git a/sources b/sources index 47275f0..0168da7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c838d059136132a2c0b1cf1602d6e92f gsettings-desktop-schemas-0.1.7.tar.bz2 +7acffaaae8495a4f15e1412f4da9c497 gsettings-desktop-schemas-2.91.91.tar.bz2 From 210414bccb6c4644c1c47d10057d602ce9a6a524 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 9 Mar 2011 18:40:13 +0000 Subject: [PATCH 5/7] Fix possible crasher when converting schemas --- ...Remove-at-mobility-schema-conversion.patch | 27 +++++++++++++++++++ gsettings-desktop-schemas.spec | 9 +++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0001-schemas-Remove-at-mobility-schema-conversion.patch diff --git a/0001-schemas-Remove-at-mobility-schema-conversion.patch b/0001-schemas-Remove-at-mobility-schema-conversion.patch new file mode 100644 index 0000000..6dc4b3b --- /dev/null +++ b/0001-schemas-Remove-at-mobility-schema-conversion.patch @@ -0,0 +1,27 @@ +From e2e8a52260f79e6afd4ff242327feff7b798eb49 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 9 Mar 2011 17:44:24 +0000 +Subject: [PATCH] schemas: Remove at mobility schema conversion + +Spotted by Matthias Clasen +--- + schemas/gsettings-desktop-schemas.convert | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert +index afd8ad7..d7172dd 100644 +--- a/schemas/gsettings-desktop-schemas.convert ++++ b/schemas/gsettings-desktop-schemas.convert +@@ -19,9 +19,6 @@ autorun-x-content-ignore = /apps/nautilus/preferences/media_autorun_x_content_ig + autorun-x-content-open-folder = /apps/nautilus/preferences/media_autorun_x_content_open_folder + + # From org.gnome.desktop.default-applications.gschema.xml +-[org.gnome.desktop.default-applications.at.mobility] +-exec = /desktop/gnome/applications/at/mobility/exec +- + [org.gnome.desktop.default-applications.office.calendar] + exec = /desktop/gnome/applications/calendar/exec + needs-term = /desktop/gnome/applications/calendar/needs_term +-- +1.7.4.1 + diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 7bc46cd..3c87e49 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas Version: 2.91.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -16,6 +16,8 @@ BuildRequires: intltool Requires: glib2 >= 2.25.11 +Patch0: 0001-schemas-Remove-at-mobility-schema-conversion.patch + %description gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. @@ -32,7 +34,7 @@ and header files for developing applications that use %{name}. %prep %setup -q - +%patch0 -p1 %build %configure --disable-schemas-compile @@ -68,6 +70,9 @@ fi %changelog +* Wed Mar 09 2011 Bastien Nocera 2.91.91-2 +- Fix possible crasher when converting schemas + * Tue Mar 08 2011 Bastien Nocera 2.91.91-1 - Update to 2.91.91 From 2f151a133fdb64a83a2fd1955dc64dcdf2107927 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Mar 2011 19:20:24 -0400 Subject: [PATCH 6/7] 2.91.92 --- .gitignore | 1 + gsettings-desktop-schemas.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4f8180a..63a99fe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2 /gsettings-desktop-schemas-0.1.5.tar.bz2 /gsettings-desktop-schemas-0.1.7.tar.bz2 /gsettings-desktop-schemas-2.91.91.tar.bz2 +/gsettings-desktop-schemas-2.91.92.tar.bz2 diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 3c87e49..eebb037 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas -Version: 2.91.91 -Release: 2%{?dist} +Version: 2.91.92 +Release: 1%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -70,6 +70,9 @@ fi %changelog +* Mon Mar 21 2011 Matthias Clasen 2.91.92-1 +- Update to 2.91.92 + * Wed Mar 09 2011 Bastien Nocera 2.91.91-2 - Fix possible crasher when converting schemas diff --git a/sources b/sources index 0168da7..96f47ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7acffaaae8495a4f15e1412f4da9c497 gsettings-desktop-schemas-2.91.91.tar.bz2 +498e5ea8ab43ee39f4e0e2262a78936b gsettings-desktop-schemas-2.91.92.tar.bz2 From cd5779c91434b4d50ebc1562f257252f6580afa3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Mar 2011 19:30:13 -0400 Subject: [PATCH 7/7] drop obsolete patch --- gsettings-desktop-schemas.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index eebb037..ee84838 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -16,8 +16,6 @@ BuildRequires: intltool Requires: glib2 >= 2.25.11 -Patch0: 0001-schemas-Remove-at-mobility-schema-conversion.patch - %description gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. @@ -28,13 +26,12 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -The %{name}-devel package contains libraries +The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %build %configure --disable-schemas-compile