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

[Wolfgang Ulbrich]

Author: raveit65

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

Modified Files:
	caja-dropbox.spec 
Log Message:
update spec file and bump version


Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- caja-dropbox.spec	21 Jul 2013 08:59:47 -0000	1.2
+++ caja-dropbox.spec	21 Jul 2013 14:15:06 -0000	1.3
@@ -1,14 +1,18 @@
 Summary: 		Dropbox extension for caja
 Name: 			caja-dropbox
 Version: 		1.6.0
-Release: 		3%{?dist}
+Release: 		4%{?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
 
 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
 
 BuildRequires: 	mate-file-manager-devel
 BuildRequires:  python-docutils
@@ -16,11 +20,6 @@
 BuildRequires:  automake
 BuildRequires:  libtool
 
-# Run a fake X session 
-BuildRequires:  xorg-x11-server-Xvfb
-BuildRequires:  xorg-x11-xauth
-BuildRequires:  zlib-devel
-
 Requires: 		mate-file-manager-extensions
 Requires: 		pygtk2
 Requires: 		hicolor-icon-theme
@@ -35,18 +34,24 @@
 
 %patch0 -p1 -b .deprecations
 %patch1 -p1 -b .caja
+%patch2 -p1 -b .disable-creation
 
 autoreconf -i -f
+%patch3 -p1 -b .pygtk
+
+cp %{SOURCE1} dropbox
 
 %build
-# xvfb-run is needed to find pygtk2
-xvfb-run -a ./configure CFLAGS="$RPM_OPT_FLAGS"
+%configure
 
-xvfb-run -a make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+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 {} ';'
 
@@ -81,6 +86,11 @@
 
 
 %changelog
+* 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
+- fix pygtk2 configure issue
+
 * Sat Jul 20 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-3
 - add exports