leigh123linux pushed to nemo (f22). "update to git snapshot"

Wed May 20 10:23:06 UTC 2015

From 9616fd8ad8b516fb13bce7c2357134df34b9cefb Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 17:09:21 +0100
Subject: update to git snapshot

diff --git a/.gitignore b/.gitignore
index fda06ca..63cc619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
 /nemo-2.4.3.tar.gz
 /nemo-2.4.4.tar.gz
 /nemo-2.4.5.tar.gz
+/nemo-2.5.0.git1afb0a3.tar.gz
diff --git a/0001-open-as-root-Change-polkit-policy-to-_keep-to-cache-.patch b/0001-open-as-root-Change-polkit-policy-to-_keep-to-cache-.patch
deleted file mode 100644
index 31e8d01..0000000
--- a/0001-open-as-root-Change-polkit-policy-to-_keep-to-cache-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 82f02449c91aead388d0ded72d28096fd081e02e Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster at gmail.com>
-Date: Fri, 12 Dec 2014 07:22:55 -0500
-Subject: [PATCH 1/3] open as root: Change polkit policy to _keep to cache
- authorization (and keep the user from having to repeatedly enter a password).
-
----
- src/org.nemo.root.policy.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/org.nemo.root.policy.in b/src/org.nemo.root.policy.in
-index 3e892b9..d173a33 100644
---- a/src/org.nemo.root.policy.in
-+++ b/src/org.nemo.root.policy.in
-@@ -13,9 +13,9 @@
-    <message>Authentication is required to run Nemo as root</message>
-    <icon_name>gksu-root-terminal</icon_name>
-    <defaults>
--     <allow_any>auth_admin</allow_any>
--     <allow_inactive>auth_admin</allow_inactive>
--     <allow_active>auth_admin</allow_active>
-+     <allow_any>auth_admin_keep</allow_any>
-+     <allow_inactive>auth_admin_keep</allow_inactive>
-+     <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/nemo</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
--- 
-2.1.0
-
diff --git a/file_preview_limit.patch b/file_preview_limit.patch
deleted file mode 100644
index 07a7eaa..0000000
--- a/file_preview_limit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/nemo-file-management-properties.c	2014-11-24 08:12:37.000000000 +0000
-+++ b/src/nemo-file-management-properties.c	2014-12-21 10:13:54.506633805 +0000
-@@ -191,7 +191,8 @@ static const guint64 thumbnail_limit_val
- 	104857600,
- 	1073741824,
- 	2147483648U,
--	4294967295U
-+	4294967295U,
-+	8589934592U
- };
- 
- static const char * const icon_captions_components[] = {
---- a/src/nemo-file-management-properties.glade	2014-11-24 08:12:37.000000000 +0000
-+++ b/src/nemo-file-management-properties.glade	2014-12-21 10:15:29.288071866 +0000
-@@ -242,6 +242,9 @@
-       <row>
-         <col id="0" translatable="yes">4 GB</col>
-       </row>
-+      <row>
-+        <col id="0" translatable="yes">8 GB</col>
-+      </row>
-     </data>
-   </object>
-   <object class="GtkDialog" id="file_management_dialog">
diff --git a/nemo.spec b/nemo.spec
index b8ca3cc..33372f8 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -1,25 +1,21 @@
-#global _internal_version  b157906
+%global _internal_version  1afb0a3
 
 Name:           nemo
 Summary:        File manager for Cinnamon
-Version:        2.4.5
-Release:        2%{?dist}
+Version:        2.5.0
+Release:        0.1.git%{_internal_version}%{?dist}
 License:        GPLv2+ and LGPLv2+
 Group:          User Interface/Desktops
 URL:            https://github.com/linuxmint/nemo
 # To generate source
 # wget https://github.com/linuxmint/nemo/tarball/%%{_internal_version} -O nemo-%%{version}.git%%{_internal_version}.tar.gz
-#Source0:        http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%%{version}.git%%{_internal_version}.tar.gz
-Source0:        http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz
+Source0:        http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.git%{_internal_version}.tar.gz
+#Source0:        http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%%{version}.tar.gz
 Source1:        nemo.css
 Source2:        gtk.css
 Source3:        gtk-dark.css
 Source4:        nemo-fedora.gschema.override
 
-Patch0:         file_preview_limit.patch
-Patch1:         0001-open-as-root-Change-polkit-policy-to-_keep-to-cache-.patch
-Patch2:         0001-Add-application-specific-theme-for-Adwaita.patch
-
 Requires:       redhat-menus
 Requires:       gvfs
 Requires:       gnome-icon-theme
@@ -87,9 +83,8 @@ Requires:  gnome-themes-standard
 Nemo theme fix for Adwaita
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n linuxmint-%{name}-%{_internal_version}
 
-mv configure.in configure.ac
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -170,10 +165,11 @@ fi
 %{_datadir}/icons/hicolor/*/actions/nemo-eject.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg
 %{_datadir}/dbus-1/services/org.Nemo.service
-%{_datadir}/dbus-1/services/org.freedesktop.NemoFileManager1.service
+%{_datadir}/dbus-1/services/org.nemo.freedesktop.FileManager1.service
 %{_mandir}/man1/nemo-connect-server.1.*
 %{_mandir}/man1/nemo.1.*
 %{_libexecdir}/nemo-convert-metadata
+%{_libexecdir}/nemo-extensions-list
 %{_datadir}/glib-2.0/schemas/*
 %dir %{_libdir}/nemo/extensions-3.0/
 %{_datadir}/polkit-1/actions/org.nemo.root.policy
@@ -194,6 +190,9 @@ fi
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.1.git1afb0a3
+- update to git snapshot
+
 * Thu Apr 02 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.5-2
 - drop merged patch
 
diff --git a/sources b/sources
index f08032d..a1fed57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3791d6e5b2596ffe99a87f4b4250035  nemo-2.4.5.tar.gz
+79494689674078d621f2a89bd9b5e2aa  nemo-2.5.0.git1afb0a3.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nemo.git/commit/?h=f22&id=9616fd8ad8b516fb13bce7c2357134df34b9cefb
