Accepting request 251996 from GNOME:Next

Push 3.14 - resub with patch

OBS-URL: https://build.opensuse.org/request/show/251996
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=168
This commit is contained in:
Dominique Leuenberger 2014-09-25 07:42:09 +00:00 committed by Git OBS Bridge
parent 1531f643a8
commit 890c5e958b
5 changed files with 39 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90853f697bbc6c8cd982ed9a6f5b5792e2d2f88e04e9bcaa732169343f9db6e7
size 2799412

3
gedit-3.14.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c74f456cc3c0200a3409c3ece17fae17a22ee38213a53aa29ff8e346cba2f90
size 2847576

10
gedit-nobinenv.patch Normal file
View File

@ -0,0 +1,10 @@
Index: gedit-3.14.0/plugins/externaltools/data/send-to-fpaste.tool.in
===================================================================
--- gedit-3.14.0.orig/plugins/externaltools/data/send-to-fpaste.tool.in
+++ gedit-3.14.0/plugins/externaltools/data/send-to-fpaste.tool.in
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/python3
import os, urllib, json, sys, urllib.request
from gi.repository import Gtk, Gdk

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Sep 24 19:37:13 UTC 2014 - dimstar@opensuse.org
- Add gedit-nobinenv.patch: do not add dependency to non-existing
/bin/env.
-------------------------------------------------------------------
Mon Sep 22 17:32:14 UTC 2014 - zaitor@opensuse.org
- Update to version 3.14.0:
+ Improvements on OSX port.
+ Improvements on Win32 port.
+ Misc bugfixes.
+ Updated translations.
- Add pkgconfig(vapigen) BuildRequires: Build vala support.
-------------------------------------------------------------------
Tue Aug 19 17:50:05 UTC 2014 - zaitor@opensuse.org

View File

@ -19,15 +19,17 @@
%define _with_gi_python 1
Name: gedit
Version: 3.13.91
Version: 3.14.0
Release: 0
Summary: Small and lightweight UTF-8 text editor
License: GPL-2.0+
Group: Productivity/Text/Editors
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gedit/3.13/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gedit/3.14/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gedit-desktop.patch -- adds more MIME types and change icon
Patch0: gedit-desktop.patch
# PATCH-FIX-UPSTREAM gedit-nobinenv.patch dimstar@opensuse.org -- Do not add dependency to non-existing /bin/env.
Patch1: gedit-nobinenv.patch
BuildRequires: enchant-devel
BuildRequires: fdupes
BuildRequires: gettext
@ -40,8 +42,8 @@ BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(gio-2.0) >= 2.39.3
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.6
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.13.4
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.14.0
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libpeas-1.0) >= 1.7.0
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.7.0
@ -49,6 +51,7 @@ BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0
BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0
BuildRequires: pkgconfig(sm) >= 1.0.0
BuildRequires: pkgconfig(vapigen) >= 0.25.1
BuildRequires: pkgconfig(x11)
Requires: python3-cairo
%if %{_with_gi_python}
@ -101,6 +104,7 @@ environment.
%setup -q
translation-update-upstream
%patch0 -p0
%patch1 -p1
%build
%configure \
@ -195,5 +199,7 @@ rm -rf %{buildroot}
%{_datadir}/gedit/gir-1.0/
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_datadir}/vala/vapi/gedit.deps
%{_datadir}/vala/vapi/gedit.vapi
%changelog