diff --git a/pluma.spec b/pluma.spec index e60f93e..666ada3 100644 --- a/pluma.spec +++ b/pluma.spec @@ -16,7 +16,7 @@ Summary: Text editor for the MATE desktop Name: pluma Version: %{branch}.1 %if 0%{?rel_build} -Release: 1%{?dist} +Release: 2%{?dist} %else Release: 0.5%{?git_rel}%{?dist} %endif @@ -30,6 +30,9 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +# disable python plugins +Patch1: pluma_0001-disable-python-plugins-again.patch + BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: libpeas-devel @@ -40,15 +43,15 @@ BuildRequires: iso-codes-devel BuildRequires: libSM-devel BuildRequires: mate-common BuildRequires: pygobject3-devel -BuildRequires: pygtksourceview-devel -BuildRequires: python2-devel +#BuildRequires: pygtksourceview-devel +#BuildRequires: python2-devel BuildRequires: rarian-compat BuildRequires: yelp-tools Requires: %{name}-data = %{version}-%{release} -Requires: pygtk2 -Requires: pygobject2 -Requires: pygtksourceview +#Requires: pygtk2 +Requires: pygobject3 +#Requires: pygtksourceview # needed to get a gsettings schema, #959607 Requires: mate-desktop-libs # needed to get a gsettings schema, #959607 @@ -56,9 +59,9 @@ Requires: caja-schemas # the run-command plugin uses zenity Requires: zenity # libpeas isn't splited in rhel7 -%if 0%{?fedora} -Requires: libpeas-loader-python -%endif +#%%if 0%{?fedora} +#Requires: libpeas-loader-python +#%%endif %description pluma is a small, but powerful text editor designed specifically for @@ -86,7 +89,7 @@ Summary: Support for developing plugins for the pluma text editor Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gtksourceview3-devel -Requires: pygtk2-devel +#Requires: pygtk2-devel %description devel Development files for pluma @@ -107,6 +110,9 @@ Development files for pluma NOCONFIGURE=1 ./autogen.sh %endif +# disable python plugins +NOCONFIGURE=1 ./autogen.sh + # Fix debug permissions with messy hack find ./*/* -type f -exec chmod 644 {} \; find ./*/*/* -type f -exec chmod 644 {} \; @@ -160,6 +166,9 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %changelog +* Fri Apr 20 2018 Wolfgang Ulbrich - 1.20.1-2 +- disable python plugins for f29 + * Tue Mar 27 2018 Wolfgang Ulbrich - 1.20.1-1 - update to 1.20.1 - drop IconCache rpm scriptlet diff --git a/pluma_0001-disable-python-plugins-again.patch b/pluma_0001-disable-python-plugins-again.patch new file mode 100644 index 0000000..ba3affd --- /dev/null +++ b/pluma_0001-disable-python-plugins-again.patch @@ -0,0 +1,78 @@ +From 59054bb7dfbd5f6f985ddd1712da22262425b8a6 Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Fri, 20 Apr 2018 16:34:35 +0200 +Subject: [PATCH] disable python plugins again + +--- + configure.ac | 14 -------------- + plugins/Makefile.am | 8 -------- + 2 files changed, 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8ccb37d..177d305 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,8 +181,6 @@ else + have_introspection=no + fi + +-AM_PATH_PYTHON([2.7]) +- + dnl ================================================================ + dnl GSettings related settings + dnl ================================================================ +@@ -233,21 +231,9 @@ pixmaps/Makefile + plugins/Makefile + plugins/changecase/Makefile + plugins/docinfo/Makefile +-plugins/externaltools/data/Makefile +-plugins/externaltools/Makefile +-plugins/externaltools/scripts/Makefile +-plugins/externaltools/tools/Makefile + plugins/filebrowser/Makefile + plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml + plugins/modelines/Makefile +-plugins/pythonconsole/Makefile +-plugins/pythonconsole/pythonconsole/Makefile +-plugins/quickopen/Makefile +-plugins/quickopen/quickopen/Makefile +-plugins/snippets/data/lang/Makefile +-plugins/snippets/data/Makefile +-plugins/snippets/Makefile +-plugins/snippets/snippets/Makefile + plugins/sort/Makefile + plugins/spell/Makefile + plugins/spell/org.mate.pluma.plugins.spell.gschema.xml +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 28ae891..c80139c 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -1,12 +1,8 @@ + DIST_SUBDIRS = \ + changecase \ + docinfo \ +- externaltools \ + filebrowser \ + modelines \ +- pythonconsole \ +- quickopen \ +- snippets \ + sort \ + spell \ + taglist \ +@@ -16,12 +12,8 @@ DIST_SUBDIRS = \ + SUBDIRS = \ + changecase \ + docinfo \ +- externaltools \ + filebrowser \ + modelines \ +- pythonconsole \ +- quickopen \ +- snippets \ + sort \ + taglist \ + time \ +-- +2.13.6 +