rpms/gedit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2.31.2

Browse Source
This commit is contained in:
Matthias Clasen 2010-05-28 03:27:22 +00:00
parent 7e44ce2bd1
commit 175086d4ee
4 changed files with 84 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
gedit-2.31.1.tar.bz2
gedit-2.31.2.tar.bz2

64
gedit-gsettings-migration.patch Normal file
View File

@ -0,0 +1,64 @@
diff -up gedit-2.31.2/data/gedit.convert.gsettings-migration gedit-2.31.2/data/gedit.convert
--- gedit-2.31.2/data/gedit.convert.gsettings-migration 2010-05-27 21:27:37.942675840 -0400
+++ gedit-2.31.2/data/gedit.convert 2010-05-27 21:27:27.434675421 -0400
@@ -0,0 +1,47 @@
+[org.gnome.gedit.preferences.editor]
+use-default-font = /apps/gedit-2/preferences/editor/font/use_default_font
+editor-font = /apps/gedit-2/preferences/editor/font/editor_font
+scheme = /apps/gedit-2/preferences/editor/colors/scheme
+create-backup-copy = /apps/gedit-2/preferences/editor/save/create_backup_copy
+auto-save = /apps/gedit-2/preferences/editor/save/auto_save
+auto-save-interval = /apps/gedit-2/preferences/editor/save/auto_save_interval
+undo-actions-limit = /apps/gedit-2/preferences/editor/undo/undo_actions_limit
+max-undo-actions = /apps/gedit-2/preferences/editor/undo/max_undo_actions
+wrap-mode = /apps/gedit-2/preferences/editor/wrap_mode/wrap_mode
+tabs-size = /apps/gedit-2/preferences/editor/tabs/tabs_size
+insert-spaces = /apps/gedit-2/preferences/editor/tabs/insert_spaces
+auto-indent = /apps/gedit-2/preferences/editor/auto_indent/auto_indent
+display-line-numbers = /apps/gedit-2/preferences/editor/line_numbers/display_line_numbers
+highlight-current-line = /apps/gedit-2/preferences/editor/current_line/highlight_current_line
+bracket-matching = /apps/gedit-2/preferences/editor/bracket_matching/bracket_matching
+display-right-margin = /apps/gedit-2/preferences/editor/right_margin/display_right_margin
+right-margin-position = /apps/gedit-2/preferences/editor/right_margin/right_margin_position
+smart-home-end = /apps/gedit-2/preferences/editor/smart_home_end/smart_home_end
+writable-vfs-schemes = /apps/gedit-2/preferences/editor/save/writable_vfs_schemes
+restore-cursor-position = /apps/gedit-2/preferences/editor/cursor_position/restore_cursor_position
+syntax-highlighting = /apps/gedit-2/preferences/syntax_highlighting/enable
+search-highlighting = /apps/gedit-2/preferences/search_highlighting/enable
+
+[org.gnome.gedit-preferences.ui]
+toolbar-visible = /apps/gedit-2/preferences/ui/toolbar/toolbar_visible
+toolbar-buttons-style = /apps/gedit-2/preferences/ui/toolbar/toolbar_buttons_style
+statusbar-visible = /apps/gedit-2/preferences/ui/statusbar/statusbar_visible
+side-pane-visible = /apps/gedit-2/preferences/ui/side_pane/side_pane_visible
+bottom-pane-visible = /apps/gedit-2/preferences/ui/bottom_panel/bottom_panel_visible
+max-recents = /apps/gedit-2/preferences/ui/recents/max_recents
+
+[org.gnome.gedit.preferences.print]
+print-syntax-highlighting =/apps/gedit-2/preferences/print/page/print_syntax_highlighting
+print-header = /apps/gedit-2/preferences/print/page/print_header
+print-wrap-mode = /apps/gedit-2/preferences/print/page/print_wrap_mode
+#print-line-numbers = /apps/gedit-2/preferences/print/page/print_line_numbers
+print-font-body-pango = /apps/gedit-2/preferences/print/fonts/print_font_body_pango
+print-font-header-pango = /apps/gedit-2/preferences/print/fonts/print_font_header_pango
+print-font-numbers-pango = /apps/gedit-2/preferences/print/fonts/print_font_numbers_pango
+
+[org.gnome.gedit.preferences.encodings]
+auto-detected = /apps/gedit-2/preferences/encodings/auto_detected
+shown-in-menu = /apps/gedit-2/preferences/encodings/shown_in_menu
+
+[org.gnome.gedit.plugins]
+active-plugins = /apps/gedit-2/plugins/active-plugins
diff -up gedit-2.31.2/data/Makefile.am.gsettings-migration gedit-2.31.2/data/Makefile.am
--- gedit-2.31.2/data/Makefile.am.gsettings-migration 2010-05-27 21:27:49.415675071 -0400
+++ gedit-2.31.2/data/Makefile.am 2010-05-27 21:28:38.157675632 -0400
@@ -26,6 +26,9 @@ gsettings_SCHEMAS = org.gnome.gedit.gsch
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gedit.convert
+
EXTRA_DIST = \
$(desktop_in_files) \
$(service_in_files) \

34
gedit.spec
View File

@ -2,19 +2,18 @@
%define gtk2_version 2.16.0
%define desktop_file_utils_version 0.9
%define gail_version 1.2.0
%define gtksourceview_version 2.9.4
%define gtksourceview_version 2.10.2
%define pygtk_version 2.12.0
%define pygobject_version 2.15.4
%define pygtksourceview_version 2.8.0
%define gnome_python_desktop_version 2.15.90
%define gnome_doc_utils_version 0.3.2
%define gconf_version 2.14
%define enchant_version 1.2.0
%define isocodes_version 0.35
Summary: Text editor for the GNOME desktop
Name: gedit
Version: 2.31.1
Version: 2.31.2
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@ -24,9 +23,6 @@ Source0: http://download.gnome.org/sources/gedit/2.31/gedit-%{version}.tar.bz2
URL: http://projects.gnome.org/gedit/
Requires(post): GConf2 >= %{gconf_version}
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
@ -41,7 +37,10 @@ Patch1: gedit-2.13.90-libdir.patch
Patch2: gedit-2.25.5-fix-python-path.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=587053
Patch3: print-to-file.patch
#Patch3: print-to-file.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=619898
Patch4: gedit-gsettings-migration.patch
BuildRequires: gnome-common
BuildRequires: glib2-devel >= %{glib2_version}
@ -108,7 +107,8 @@ Install gedit-devel if you want to write plugins for gedit.
%endif
%patch2 -p1 -b .fix-python-path
%patch3 -p1 -b .print-to-file
#%patch3 -p1 -b .print-to-file
%patch4 -p1 -b .gsettings-migration
autoreconf -f -i
intltoolize -f
@ -169,24 +169,19 @@ done
%post
update-desktop-database -q
%gconf_schema_upgrade gedit
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
%pre
%gconf_schema_prepare gedit
%preun
%gconf_schema_remove gedit
%postun
update-desktop-database -q
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas
%files -f %{name}.lang
%defattr(-, root, root)
@ -197,7 +192,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/gedit-2
%{_libexecdir}/gedit-2
%{_bindir}/*
%{_sysconfdir}/gconf/schemas/*
%{_datadir}/GConf/gsettings
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.time.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.file-browser.gschema.xml
%{_datadir}/dbus-1/services/org.gnome.gedit.service
%files devel
@ -208,6 +207,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
* Thu May 27 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.2-1
- Update to 2.31.2
* Sat May 15 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.1-1
- Update to 2.31.1

2
sources
View File

@ -1 +1 @@
e2189cd42f6986e1bd4106dd10bf45b7 gedit-2.31.1.tar.bz2
b4270e69c8c44a5665eb5a68be1e9a0e gedit-2.31.2.tar.bz2