[mate-file-manager] Update to 1.7.0
Dan Mashal
vicodan at fedoraproject.org
Thu Dec 5 12:53:17 UTC 2013
commit 18eb2cee30b2df57ccb7b27015e636f553e3fa4b
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Thu Dec 5 04:50:42 2013 -0800
Update to 1.7.0
.gitignore | 1 +
mate-file-manager.spec | 31 +++++++++++++++++++------------
sources | 2 +-
3 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7ee07c..d56be8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/mate-file-manager-1.6.2.git73cc7e9.tar.xz
/mate-file-manager-1.6.3.git73cc7e9.tar.xz
/mate-file-manager-1.6.3.gitbf47018.tar.xz
+/mate-file-manager-1.7.0.tar.gz
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index ecf8000..8813e60 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -1,25 +1,26 @@
-%global _internal_version bf47018
-
Name: mate-file-manager
Summary: File manager for MATE
-Version: 1.6.3
-Release: 0.10.git%{_internal_version}%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
URL: http://mate-desktop.org
# To generate tarball
# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
-Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
+#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
+
+#Source0: http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
-#Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+#Temporary bandaid until we finish testing and rename the package
+Source0: http://vicodan.fedorapeople.org/%{name}-%{version}.tar.gz
Source1: caja-autostart.desktop
Source2: caja-autostart
# upstream patches
#https://github.com/mate-desktop/mate-file-manager/pull/112
-Patch0: mate-file-manager_windows-open-folders-in-same-window-spatial-mode.patch
+#Patch0: mate-file-manager_windows-open-folders-in-same-window-spatial-mode.patch
# fix https://github.com/mate-desktop/mate-file-manager/issues/122
# https://github.com/mate-desktop/mate-file-manager/pull/180
Patch1: mate-file-manager_allow-dropping-files-to-bookmarks.patch
@@ -29,6 +30,7 @@ Patch2: mate-file-manager_rearranged-caja-sidebar-to-1.4-style.patch
%endif
Patch3: mate-file-manager_x-caja-windows.patch
+BuildRequires: chrpath
BuildRequires: mate-desktop-devel
BuildRequires: pkgconfig(sm)
BuildRequires: desktop-file-utils
@@ -39,7 +41,6 @@ BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: mate-common
-BuildRequires: mate-doc-utils
BuildRequires: pkgconfig(cairo-gobject)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
@@ -92,13 +93,13 @@ This package provides libraries and header files needed
for developing caja extensions.
%prep
-%setup -q -n %{name}-%{_internal_version}
+%setup -q
# use the caja-autostart script for autorestart caja if killed, fix spawning x-caja-windows
# rhbz #886029
sed -i -e 's,Exec=caja -n,Exec=/usr/bin/caja-autostart,g' data/caja.desktop.in.in data/caja.desktop.in.in
-%patch0 -p1 -b .spatial
+#%patch0 -p1 -b .spatial
%patch1 -p1 -b .bookmarks
%if 0%{?fedora} > 19
%patch2 -p1 -b .1.4-style
@@ -106,8 +107,6 @@ sed -i -e 's,Exec=caja -n,Exec=/usr/bin/caja-autostart,g' data/caja.desktop.in.i
%patch3 -p1 -b .x-caja-windows
-NOCONFIGURE=1 ./autogen.sh
-
%build
%configure \
--disable-static \
@@ -129,6 +128,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/caja-convert-metadata
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-connect-server
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-autorun-software
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/caja-file-management-properties
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache
@@ -210,6 +214,9 @@ fi
%changelog
+* Thu Dec 05 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
+- Update to 1.7.0
+
* Tue Nov 12 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-0.10.gitbf47018
- add start delay again for f20
diff --git a/sources b/sources
index 5ff9ea8..b915bec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77a6bb915f9d211abf76d4fafced1f6d mate-file-manager-1.6.3.gitbf47018.tar.xz
+d9ade52ab4a8d1f67ab3f93bbf18076b mate-file-manager-1.7.0.tar.gz
More information about the scm-commits
mailing list