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

Make usage of Zeitgeist and python3 conditional

Browse Source
This commit is contained in:
Marek Kasik 2013-05-06 14:10:11 +02:00
parent 22d2d92721
commit 850a6092f6
2 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gedit-disable-python3.patch Normal file
View File

@ -0,0 +1,22 @@
--- gedit-3.8.1/configure.ac
+++ gedit-3.8.1/configure.ac
@@ -34,7 +34,7 @@ PKG_PROG_PKG_CONFIG
# needed on osx
AC_PROG_OBJC
-AM_PATH_PYTHON(3.2.3)
+AM_PATH_PYTHON
# Initialize libtool
LT_PREREQ([2.2.6])
--- gedit-3.8.1/gedit/gedit-plugins-engine.c
+++ gedit-3.8.1/gedit/gedit-plugins-engine.c
@@ -66,7 +66,7 @@ gedit_plugins_engine_init (GeditPluginsE
GEDIT_TYPE_PLUGINS_ENGINE,
GeditPluginsEnginePrivate);
- peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
+ peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");

46
gedit.spec
View File

@ -1,5 +1,14 @@
%if 0%{?fedora} > 12
%global with_zeitgeist 1
%global with_python3 1
%else
%global with_zeitgeist 0
%global with_python3 0
%endif
%if %{with_python3}
%global __python %{__python3}
%endif
%define glib2_version 2.28.0
%define pygo_version 2.90
@ -14,7 +23,7 @@ Summary: Text editor for the GNOME desktop
Name: gedit
Epoch: 2
Version: 3.8.1
Release: 1%{?dist}
Release: 3%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Editors
#VCS: git:git://git.gnome.org/gedit
@ -32,6 +41,8 @@ Patch1: gedit-2.13.90-libdir.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=587053
#Patch3: print-to-file.patch
Patch4: gedit-disable-python3.patch
BuildRequires: gnome-common
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel
@ -42,9 +53,7 @@ BuildRequires: iso-codes-devel >= %{isocodes_version}
BuildRequires: libattr-devel
BuildRequires: gtksourceview3-devel >= %{gtksourceview_version}
BuildRequires: gettext
BuildRequires: python3-devel
BuildRequires: pygobject3-devel
BuildRequires: python3-gobject >= %{pygo_version}
BuildRequires: libpeas-devel >= %{libpeas_version}
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: which
@ -53,8 +62,16 @@ BuildRequires: intltool
BuildRequires: gobject-introspection-devel
BuildRequires: yelp-tools
BuildRequires: itstool
%if %{with_python3}
BuildRequires: python3-devel
BuildRequires: python3-gobject >= %{pygo_version}
%else
BuildRequires: python-devel
%endif
%if %{with_python3}
Requires: python3-gobject >= %{pygo_version}
%endif
# the run-command plugin uses zenity
Requires: zenity
Requires: gsettings-desktop-schemas
@ -107,6 +124,10 @@ access and leave event for documents used with gedit.
#%patch3 -p1 -b .print-to-file
%if !%{with_python3}
%patch4 -p1 -b .disable-python
%endif
autoreconf -i -f
intltoolize -f
@ -114,7 +135,11 @@ intltoolize -f
%configure \
--disable-gtk-doc \
--enable-introspection=yes \
%if %{with_python3}
--enable-python=yes \
%else
--enable-python=no \
%endif
--disable-updater \
--enable-gvfs-metadata
make %{_smp_mflags}
@ -152,8 +177,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/gedit
%{_datadir}/applications/gedit.desktop
%{_mandir}/man1/*
%if %{with_python3}
%{python3_sitearch}/gi/overrides/Gedit.py*
%{python3_sitearch}/gi/overrides/__pycache__
%endif
%{_libexecdir}/gedit
%{_libdir}/gedit/girepository-1.0
%dir %{_libdir}/gedit
@ -163,18 +190,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_libdir}/gedit/plugins/libchangecase.so
%{_libdir}/gedit/plugins/docinfo.plugin
%{_libdir}/gedit/plugins/libdocinfo.so
%{_libdir}/gedit/plugins/externaltools.plugin
%{_libdir}/gedit/plugins/externaltools
%{_libdir}/gedit/plugins/filebrowser.plugin
%{_libdir}/gedit/plugins/libfilebrowser.so
%{_libdir}/gedit/plugins/modelines.plugin
%{_libdir}/gedit/plugins/libmodelines.so
%if %{with_python3}
%{_libdir}/gedit/plugins/externaltools.plugin
%{_libdir}/gedit/plugins/externaltools
%{_libdir}/gedit/plugins/pythonconsole.plugin
%{_libdir}/gedit/plugins/pythonconsole
%{_libdir}/gedit/plugins/quickopen.plugin
%{_libdir}/gedit/plugins/quickopen
%{_libdir}/gedit/plugins/snippets.plugin
%{_libdir}/gedit/plugins/snippets
%endif
%{_libdir}/gedit/plugins/sort.plugin
%{_libdir}/gedit/plugins/libsort.so
%{_libdir}/gedit/plugins/spell.plugin
@ -185,12 +214,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/GConf/gsettings
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
%if %{with_python3}
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%endif
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%{_datadir}/dbus-1/services/org.gnome.gedit.service
@ -206,6 +237,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%endif
%changelog
* Mon May 6 2013 Marek Kasik <mkasik@redhat.com> - 2:3.8.1-3
- Make usage of Zeitgeist and python3 conditional
* Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 2:3.8.1-1
- Update to 3.8.1