From 74404a2ae956597e4ca32b0b1e4341df612d7a4c Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Wed, 25 Jun 2014 13:11:49 +0300
Subject: [PATCH] Ship gpdefs in the -data package

It's not a separate plugin but common defines that other plugins use.
Ship them in the gedit-plugins-data package instead of previous
gedit-plugin-gpdefs.
---
 gedit-plugins.spec | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gedit-plugins.spec b/gedit-plugins.spec
index 74396f0..3b907c1 100644
--- a/gedit-plugins.spec
+++ b/gedit-plugins.spec
@@ -12,7 +12,7 @@
 
 Name:           gedit-plugins
 Version:        3.13.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -53,7 +53,6 @@ Requires:       gedit-plugin-commander
 Requires:       gedit-plugin-dashboard
 Requires:       gedit-plugin-drawspaces
 Requires:       gedit-plugin-git
-Requires:       gedit-plugin-gpdefs
 Requires:       gedit-plugin-joinlines
 Requires:       gedit-plugin-multiedit
 Requires:       gedit-plugin-smartspaces
@@ -137,12 +136,6 @@ Requires:       libgit2-glib
 %description -n gedit-plugin-git
 The gedit git plugin.
 
-%package -n     gedit-plugin-gpdefs
-Summary:        gedit gpdefs plugin
-Requires:       %{name}-data = %{version}-%{release}
-%description -n gedit-plugin-gpdefs
-The gedit gpdefs plugin.
-
 %package -n     gedit-plugin-joinlines
 Summary:        gedit joinlines plugin
 Requires:       %{name}-data = %{version}-%{release}
@@ -244,10 +237,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %files
 
 %files data -f %{name}.lang -f gedit.lang
-%defattr(-,root,root,-)
 %doc README NEWS AUTHORS COPYING
 %dir %{_libdir}/gedit/plugins/
+%dir %{_libdir}/gedit/plugins/__pycache__/
 %dir %{_datadir}/gedit/plugins/
+%{_libdir}/gedit/plugins/gpdefs.*
+%{_libdir}/gedit/plugins/__pycache__/gpdefs.*
 
 %files -n gedit-plugin-bookmarks
 %{_libdir}/gedit/plugins/bookmarks.plugin
@@ -302,10 +297,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/gedit/plugins/git.plugin
 %{_datadir}/appdata/gedit-git.metainfo.xml
 
-%files -n gedit-plugin-gpdefs
-%{_libdir}/gedit/plugins/gpdefs.*
-%{_libdir}/gedit/plugins/__pycache__/gpdefs.*
-
 %files -n gedit-plugin-joinlines
 %{_libdir}/gedit/plugins/joinlines.*
 %{_libdir}/gedit/plugins/__pycache__/joinlines.*
@@ -344,6 +335,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/appdata/gedit-wordcompletion.metainfo.xml
 
 %changelog
+* Wed Jun 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.0-2
+- Ship gpdefs in the -data package
+
 * Wed Jun 25 2014 Richard Hughes <rhughes@redhat.com> - 3.13.0-1
 - Update to 3.13.0