diff --git a/.gitignore b/.gitignore index b888262..7f63973 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /nemo-extensions-2.2.x.tar.gz /nemo-extensions-2.3.x.gited31dbd.tar.gz /nemo-extensions-2.4.x.tar.gz +/nemo-extensions-2.6.x.tar.gz diff --git a/0001-require-Vte-2.90-because-these-devs-broke-the-API-ag.patch b/0001-require-Vte-2.90-because-these-devs-broke-the-API-ag.patch deleted file mode 100644 index 1b21d6b..0000000 --- a/0001-require-Vte-2.90-because-these-devs-broke-the-API-ag.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4d295cc33a3fb090133fb06909789b2a72d2dffe Mon Sep 17 00:00:00 2001 -From: Monsta -Date: Thu, 13 Nov 2014 16:31:27 +0300 -Subject: [PATCH] require Vte 2.90 because these devs broke the API again - -(they're really good at that) ---- - nemo-terminal/src/nemo_terminal.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nemo-terminal/src/nemo_terminal.py b/nemo-terminal/src/nemo_terminal.py -index a9d117c..b83e87c 100755 ---- a/nemo-terminal/src/nemo_terminal.py -+++ b/nemo-terminal/src/nemo_terminal.py -@@ -49,6 +49,8 @@ gettext.bindtextdomain('nemo-terminal', '@prefix@/share/locale') - gettext.textdomain('nemo-terminal') - _ = gettext.gettext - -+import gi -+gi.require_version('Vte', '2.90') - from gi.repository import GObject, Nemo, Gtk, Gdk, Vte, GLib, Gio - - # DEFAULT_CONF = { --- -1.9.3 - diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 6a1c250..4d4683a 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -1,8 +1,8 @@ #global _internal_version ed31dbd Name: nemo-extensions -Version: 2.4.x -Release: 3%{?dist} +Version: 2.6.x +Release: 1%{?dist} Summary: Extensions for Nemo License: GPLv2+ and LGPLv2 @@ -12,7 +12,6 @@ URL: http://cinnamon.linuxmint.com #Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-extensions-%%{version}.git%%{_internal_version}.tar.gz Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-extensions-%{version}.tar.gz -Patch0: 0001-require-Vte-2.90-because-these-devs-broke-the-API-ag.patch BuildRequires: nemo-devel BuildRequires: python-distutils-extra @@ -128,7 +127,6 @@ Adds a "Resize Images..." menu item to the context menu. This opens a dialog whe %prep %setup -q -%patch0 -p1 %build pushd nemo-pastebin @@ -136,14 +134,12 @@ pushd nemo-pastebin popd pushd nemo-fileroller -rm missing NOCONFIGURE=1 ./autogen.sh %configure make V=1 %{?_smp_mflags} popd pushd nemo-python -rm missing mv configure.in configure.ac NOCONFIGURE=1 ./autogen.sh %configure @@ -158,6 +154,7 @@ make V=1 %{?_smp_mflags} popd pushd nemo-image-converter +NOCONFIGURE=1 gnome-autogen.sh %configure make V=1 %{?_smp_mflags} popd @@ -292,6 +289,9 @@ fi %{_datadir}/nemo-image-converter/ %changelog +* Tue Jun 02 2015 Leigh Scott - 2.6.x-1 +- update to 2.6.x + * Thu Nov 27 2014 Haïkel Guémar - 2.4.x-3 - Rebuilt against newer libmusicbrainz5 (required for nemo-preview) diff --git a/sources b/sources index 32e679a..4238ea2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3fd0a43d0d3e76f81832e01cabe35f7 nemo-extensions-2.4.x.tar.gz +6bfdae21ff24e664dc22bbee4f1056ab nemo-extensions-2.6.x.tar.gz