Attachment 690916 Details for Bug 225788 – suggested patch

[patch] suggested patch

0001-Fix-the-packaging-nits-from-RHBZ-225788.patch (text/plain), 5.00 KB, created by Matěj Cepl on 2013-01-31 14:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2013-01-31 14:04:04 UTC

Size: 5.00 KB

patch

obsolete

>From 9a9d723e9bd07c34763db65e28077f461242eb7a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Thu, 31 Jan 2013 12:45:35 +0100
>Subject: [PATCH] Fix the packaging nits from RHBZ# 225788
>
>---
> gedit.spec | 70 ++++++++++++++++----------------------------------------------
> 1 file changed, 18 insertions(+), 52 deletions(-)
>
>diff --git a/gedit.spec b/gedit.spec
>index 198d4da..7f91d68 100644
>--- a/gedit.spec
>+++ b/gedit.spec
>@@ -33,8 +33,6 @@ Patch1: gedit-2.13.90-libdir.patch
> #Patch3: print-to-file.patch
> 
> BuildRequires: gnome-common
>-BuildRequires: glib2-devel >= %{glib2_version}
>-BuildRequires: gtk3-devel
> BuildRequires: libSM-devel
> BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
> BuildRequires: enchant-devel >= %{enchant_version}
>@@ -47,7 +45,6 @@ BuildRequires: pygobject3-devel
> BuildRequires: python3-gobject >= %{pygo_version}
> BuildRequires: libpeas-devel >= %{libpeas_version}
> BuildRequires: gsettings-desktop-schemas-devel
>-BuildRequires: which
> BuildRequires: autoconf, automake, libtool
> BuildRequires: intltool
> BuildRequires: gobject-introspection-devel
>@@ -111,12 +108,12 @@ intltoolize -f
> 
> %build
> %configure \
>-	--disable-scrollkeeper \
>-	--disable-gtk-doc \
>-	--enable-introspection=yes \
>-	--enable-python=yes \
>-	--disable-updater \
>-	--enable-gvfs-metadata
>+  --disable-scrollkeeper \
>+  --disable-gtk-doc \
>+  --enable-introspection=yes \
>+  --enable-python=yes \
>+  --disable-updater \
>+  --enable-gvfs-metadata
> make %{_smp_mflags}
> 
> %install
>@@ -153,48 +150,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
> %files -f %{name}.lang
> %defattr(-, root, root, -)
> %doc README COPYING AUTHORS
>-%{_datadir}/gedit
>+%{_bindir}/gedit
>+%{_bindir}/gnome-text-editor
>+%{_datadir}/gedit/
> %{_datadir}/applications/gedit.desktop
> %{_mandir}/man1/*
>-%{_libdir}/python3.3/site-packages/gi/overrides/Gedit.py*
>-%{_libdir}/python3.3/site-packages/gi/overrides/__pycache__
>-%{_libexecdir}/gedit
>-%{_libdir}/gedit/girepository-1.0
>-%dir %{_libdir}/gedit
>-%dir %{_libdir}/gedit/plugins
>-%{_libdir}/gedit/libgedit-private.so
>-%{_libdir}/gedit/plugins/changecase.plugin
>-%{_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
>-%{_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
>-%{_libdir}/gedit/plugins/sort.plugin
>-%{_libdir}/gedit/plugins/libsort.so
>-%{_libdir}/gedit/plugins/spell.plugin
>-%{_libdir}/gedit/plugins/libspell.so
>-%{_libdir}/gedit/plugins/time.plugin
>-%{_libdir}/gedit/plugins/libtime.so
>-%{_bindir}/*
>+%{_python3_sitearch}/gi/overrides/Gedit.py*
>+%{_python3_sitearch}/gi/overrides/__pycache__/Gedit*
>+%{_libexecdir}/gedit/
>+%{_libdir}/gedit/
> %{_datadir}/GConf/gsettings
>-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
>-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
>-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
>-%{_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}/glib-2.0/schemas/org.gnome.gedit.*
> %{_datadir}/dbus-1/services/org.gnome.gedit.service
> 
> 
>@@ -202,7 +168,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
> %defattr(-, root, root, -)
> %{_includedir}/gedit-3.0
> %{_libdir}/pkgconfig/gedit.pc
>-%{_datadir}/gtk-doc
>+%{_datadir}/gtk-doc/*
> 
> %if %{with_zeitgeist}
> %files zeitgeist
>@@ -915,12 +881,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
> 
> * Wed Feb 11 2004 Dan Williams <dcbw@redhat.com> 1:2.5.3-3
> - Correctly convert last path from open/save into a directory
>-   for storing in gconf, not a file
>+  for storing in gconf, not a file
> 
> * Fri Feb 06 2004 Dan Williams <dcbw@redhat.com> 1:2.5.3-2
> - Bring file selector size/last path patch up to 2.5.3
> - Fix up the recent-files locking algorithm to have finer
>-   resolution timeouts
>+  resolution timeouts
> 
> * Wed Jan 28 2004 Alexander Larsson <alexl@redhat.com> 1:2.5.3-1
> - update to 2.5.3
>@@ -933,7 +899,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
> 
> * Thu Jan  8 2004 Dan Williams <dcbw@redhat.com> 1:2.4.0-4
> - Remeber file selector size and last directory on open/save
>-   (gnome.org #123787)
>+  (gnome.org #123787)
> - Small hack to work around switch from autotools 1.7 - 1.8
> 
> * Tue Oct 21 2003 Matt Wilson <msw@redhat.com> 1:2.4.0-3 
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 225788: 690916 | 691580