rpms/caja-dropbox/devel caja-dropbox.spec,1.3,1.4

[Wolfgang Ulbrich]

Author: raveit65

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

Modified Files:
	caja-dropbox.spec 
Log Message:
* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-5
- try use a fake X session to find pygtk2 BR again
- adjustments for caja renaming



Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- caja-dropbox.spec	21 Jul 2013 14:15:06 -0000	1.3
+++ caja-dropbox.spec	13 Jul 2014 11:46:19 -0000	1.4
@@ -1,28 +1,35 @@
 Summary: 		Dropbox extension for caja
 Name: 			caja-dropbox
 Version: 		1.6.0
-Release: 		4%{?dist}
+Release: 		5%{?dist}
 License: 		GPLv3+ and CC-BY-ND
 Group: 			User Interface/Desktops
 URL: 			https://linux.dropbox.com
 Source0: 		https://linux.dropbox.com/packages/nautilus-dropbox-%{version}.tar.bz2
 # script binary with serialize images
-Source1: 		dropbox
+#Source1: 		dropbox
 
 Patch0:         caja-dropbox_fix_autoconf-automake_deprecations.patch
 Patch1:         caja-dropbox_nautilus_to_caja.patch
-Patch2:         caja-dropbox_disable-creation-of-dropbox-script-binary.patch
-Patch3:         caja-dropbox_fix-pygtk-in-configure.patch
+#Patch2:         caja-dropbox_disable-creation-of-dropbox-script-binary.patch
+#Patch3:         caja-dropbox_fix-pygtk-in-configure.patch
 
-BuildRequires: 	mate-file-manager-devel
+BuildRequires:  caja-devel
 BuildRequires:  python-docutils
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
+BuildRequires:  pygobject2-devel
+BuildRequires:  pygtk2-devel
 
-Requires: 		mate-file-manager-extensions
-Requires: 		pygtk2
-Requires: 		hicolor-icon-theme
+# Run a fake X session 
+BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  xorg-x11-xauth
+BuildRequires:  zlib-devel
+
+Requires:       caja-extensions
+Requires:       pygtk2
+Requires:       hicolor-icon-theme
 
 %description
 Dropbox extension for caja file manager
@@ -34,23 +41,28 @@
 
 %patch0 -p1 -b .deprecations
 %patch1 -p1 -b .caja
-%patch2 -p1 -b .disable-creation
+#%patch2 -p1 -b .disable-creation
 
 autoreconf -i -f
-%patch3 -p1 -b .pygtk
+#%patch3 -p1 -b .pygtk
 
-cp %{SOURCE1} dropbox
+#cp %{SOURCE1} dropbox
 
 %build
-%configure
+#%configure
 
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+
+# xvfb-run is needed to find pygtk2
+xvfb-run -a ./configure
+
+xvfb-run -a make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 
-mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
+#mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
+#install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -86,6 +98,10 @@
 
 
 %changelog
+* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-5
+- try use a fake X session to find pygtk2 BR again
+- adjustments for caja renaming
+
 * Sun Jul 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-4
 - don't use fake X session for build server
 - add script binary with serialize images