[mate-file-manager/f19: 4/4] add 1.6.4 release

[Wolfgang Ulbrich]

commit ca8a034258edb74331ee253e73b6fb852883a1cb
Merge: 178435a bbe2235
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Mar 14 21:22:22 2014 +0100

    add 1.6.4 release

 .gitignore             |    4 ++++
 mate-file-manager.spec |   30 ++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 8fcc243,d56be8e..bb536df
--- a/.gitignore
+++ b/.gitignore
@@@ -15,4 -15,4 +15,8 @@@
  /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
++<<<<<<< HEAD
 +/mate-file-manager-1.6.3.tar.xz
++=======
+ /mate-file-manager-1.7.0.tar.gz
++>>>>>>> master
diff --cc mate-file-manager.spec
index 5011d9d,832b033..cad770d
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@@ -1,19 -1,19 +1,19 @@@
 +%global _internal_version  bf47018
 +
  Name:       mate-file-manager
  Summary:    File manager for MATE
- Version:    1.6.3
- #Release:    0.10.git%{_internal_version}%{?dist}
- Release:    2%{?dist}
 -Version:    1.7.0
 -Release:    2%{?dist}
++Version:    1.6.4
++#Release:    0.10.git%%{_internal_version}%{?dist}
++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://raveit65.fedorapeople.org/Mate/git-upstream/%%{name}-%%{version}.git%%{_internal_version}.tar.xz
  
 -#Temporary bandaid until we finish testing and rename the package
 -Source0:     http://vicodan.fedorapeople.org/%{name}-%{version}.tar.gz
 +Source0:    http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
  
  Source1:    caja-autostart.desktop
  Source2:    caja-autostart
@@@ -126,7 -127,7 +126,7 @@@ sed -i -e 's/ -shared / -Wl,-O1,--as-ne
  make %{?_smp_mflags} V=1
  
  %install
--make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
++%{make_install}
  
  find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
  find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@@ -138,12 -144,12 +138,12 @@@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja
  
  desktop-file-install --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart %{SOURCE1}
  
--desktop-file-install									\
--	--delete-original								\
--	--dir=$RPM_BUILD_ROOT%{_datadir}/applications					\
++desktop-file-install                                \
++    --delete-original                               \
++    --dir=$RPM_BUILD_ROOT%{_datadir}/applications   \
  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
  
--# remove needless gsettings convert file to avoid slow session start
++# remove needless gsettings convert file
  rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/caja.convert
  
  # script that add a delay to start/restart caja, to fix spawning x-caja-windows
@@@ -157,6 -163,6 +157,7 @@@ install -m 755 -p %{SOURCE2} %{buildroo
  /sbin/ldconfig
  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
  /bin/touch --no-create %{_datadir}/icons/hicolor >& /dev/null || :
++/usr/bin/update-desktop-database &> /dev/null || :
  
  %postun
  /sbin/ldconfig
@@@ -165,6 -171,6 +166,7 @@@ if [ $1 -eq 0 ]; the
    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
  fi
  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
++/usr/bin/update-desktop-database &> /dev/null || :
  
  %posttrans
  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
@@@ -180,7 -186,7 +182,7 @@@ f
  
  
  %files
--%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB NEWS README
++%doc AUTHORS COPYING COPYING.LIB NEWS README
  %{_bindir}/*
  %{_datadir}/caja
  %{_libdir}/caja/
@@@ -211,11 -217,11 +213,19 @@@
  
  
  %changelog
 -* Sun Dec 08 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-2
 -- Add yet another x-caja attack patch *fingers crossed*.
 -
 -* Thu Dec 05 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
 -- Update to 1.7.0
++* Sun Feb 23 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.4-1
++- test build
++- update to 1.6.4 release
++- remove non existent COPYING-DOCS file
++- add missing update-desktop-database rpm scriptlets
++- use modern 'make install' macro
++- clean spec file from using tabs and 'macro in comment'
++
 +* Sun Feb 23 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-2
 +- remove debuging patch, fix rhbz (#1067234)
 +
 +* Mon Dec 16 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-1
 +- update to 1.6.3 release
  
  * Tue Nov 12 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-0.10.gitbf47018
  - add start delay again for f20