SPECS: captive.spec - version 1.1.6.1 - build with fuse instead of...

[tommat]

Author: tommat                       Date: Thu Jan 26 12:12:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- version 1.1.6.1
- build with fuse instead of lufs support
- regeneration on

---- Files affected:
SPECS:
   captive.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/captive.spec
diff -u SPECS/captive.spec:1.12 SPECS/captive.spec:1.13
--- SPECS/captive.spec:1.12	Thu Oct  6 01:34:31 2005
+++ SPECS/captive.spec	Thu Jan 26 13:12:23 2006
@@ -1,19 +1,18 @@
 # $Revision$, $Date$
 #
-# Conditional build:
-%bcond_without	lufs	# don't build LUFS support
 #
 Summary:	Captive - NTFS read/write filesystem for Linux
 Summary(pl):	Captive - obsługa NTFS dla Linuksa z odczytem i zapisem
 Name:		captive
-Version:	1.1.5
-Release:	0.5
+Version:	1.1.6.1
+Release:	0.1
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://www.jankratochvil.net/project/captive/dist/%{name}-%{version}.tar.gz
-# Source0-md5:	dfb7ce617745695e7a908609b9370fd6
+# Source0-md5:	81fcc21997cf46ad9440d1a1464a384e
 Patch0:		%{name}-non_root_install.patch
 Patch1:		%{name}-popt_link.patch
+Patch2:		%{name}-configure_ac.patch
 URL:		http://www.jankratochvil.net/project/captive/
 BuildRequires:	ORBit2-devel
 BuildRequires:	autoconf
@@ -21,7 +20,7 @@
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-vfs2-devel >= 2.0
 BuildRequires:	libxml2-devel >= 2.5.9
-%{?with_lufs:BuildRequires:	lufs-devel}
+BuildRequires:	libfuse-devel >= 2.4.1
 BuildRequires:	openssl-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
@@ -74,14 +73,25 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+# Fix not finished moving captive-sandbox-server to libdir
+sed -i -e 's/--sandbox-server=@sbindir@/--sandbox-server=@libdir@/g' src/client/gnomevfs/captive.conf.in
 
 %build
+%{__libtoolize}
+%{__aclocal} -I macros
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cp -f /usr/share/automake/config.sub .
+
 %configure \
 	--enable-shared \
 	--disable-static \
 	--with-readline \
 	--disable-bug-replay \
-	--enable-lufs=auto \
+	--enable-lufs=no \
+	--enable-fuse=yes \
 	--disable-install-pkg \
 	--enable-sandbox-setuid=captive \
 	--enable-sandbox-setgid=captive \
@@ -105,16 +115,17 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README THANKS TODO
-#%attr(755,root,root) /sbin/* # what was installed here?
+%attr(755,root,root) /sbin/*
 %attr(755,root,root) %{_bindir}/captive-cmdline
 #%attr(755,root,root) %{_bindir}/captive-bug-replay was here earlier.
-%attr(755,root,root) %{_sbindir}/captive-sandbox-server
+%%attr(755,root,root) %{_libdir}/captive-sandbox-server
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
+%{_sysconfdir}/w32-mod-id.captivemodid.xml
 %attr(755,root,root) %{_libdir}/libcaptive-*.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libcaptive-gnomevfs*.so
 %{_mandir}/man?/*
@@ -132,6 +143,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/01/26 12:12:23  tommat
+- version 1.1.6.1
+- build with fuse instead of lufs support
+- regeneration on
+
 Revision 1.12  2005/10/05 23:34:31  charles
 - BRs: perl-tools-pod, readline-devel, gettext-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/captive.spec?r1=1.12&r2=1.13&f=u