rpms/caja-dropbox/devel caja-dropbox.spec,1.9,1.10

[Wolfgang Ulbrich]

Author: raveit65

Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31009

Modified Files:
	caja-dropbox.spec 
Log Message:
* Sat Dec 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
- use rpmfusion dropbox require
- fix license information
- remove non needed patches



Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- caja-dropbox.spec	10 Oct 2014 17:46:15 -0000	1.9
+++ caja-dropbox.spec	20 Dec 2014 18:11:32 -0000	1.10
@@ -1,18 +1,13 @@
 Summary: 		Dropbox extension for caja
 Name: 			caja-dropbox
 Version: 		1.8.0
-Release: 		1%{?dist}
-License: 		GPLv3+ and CC-BY-ND
+Release: 		2%{?dist}
+License: 		GPLv2+
 Group: 			User Interface/Desktops
 URL: 			https://github.com/mate-desktop/caja-dropbox
 Source0: 		http://pub.mate-desktop.org/releases/1.8/caja-dropbox-%{version}.tar.xz
-# script binary with serialize images
-Source1: 		caja-dropbox
 
-Patch2:         caja-dropbox-1.8.0_disable-creation-of-dropbox-script-binary.patch
-Patch3:         caja-dropbox_fix-pygtk-in-configure.patch
-
-BuildRequires: 	caja-devel
+BuildRequires:  caja-devel
 BuildRequires:  python-docutils
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -20,9 +15,9 @@
 BuildRequires:  pygobject2-devel
 BuildRequires:  pygtk2-devel
 
-Requires: 		caja-extensions
-Requires: 		pygtk2
-Requires: 		hicolor-icon-theme
+Requires:       dropbox >= 1:2.10.0
+Requires:       caja-extensions
+Requires:       pygtk2
 
 %description
 Dropbox extension for caja file manager
@@ -32,13 +27,6 @@
 %prep
 %setup -q
 
-%patch2 -p1 -b .disable-creation
-
-autoreconf -i -f
-%patch3 -p1 -b .pygtk
-
-cp %{SOURCE1} caja-dropbox
-
 %build
 %configure
 
@@ -47,43 +35,28 @@
 %install
 %{make_install}
 
-mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/caja-dropbox
-
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
+rm -rf ${RPM_BUILD_ROOT}%{_bindir}
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}
 
-%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/caja-dropbox.desktop
-
+%post -p /sbin/ldconfig
 
-%post
-/sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%postun -p /sbin/ldconfig
 
 
 %files
 %doc AUTHORS COPYING NEWS README 
-%{_bindir}/caja-dropbox
-%{_datadir}/caja-dropbox/
-%{_datadir}/icons/hicolor/*
-%{_mandir}/man1/caja-dropbox.1.gz
-%{_datadir}/applications/caja-dropbox.desktop
 %{_libdir}/caja/extensions-2.0/libcaja-dropbox.so
 
 
 %changelog
+* Sat Dec 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
+- use rpmfusion dropbox require
+- fix license information
+- remove non needed patches
+
 * Fri Oct 10 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-1
 - switch to mate upstream
 - update to 1.8.0 release