Author: djurban                      Date: Wed Feb  1 17:01:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- works, updated to 1.1.7

---- Files affected:
SPECS:
   captive.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/captive.spec
diff -u SPECS/captive.spec:1.17 SPECS/captive.spec:1.18
--- SPECS/captive.spec:1.17     Fri Jan 27 12:11:00 2006
+++ SPECS/captive.spec  Wed Feb  1 18:01:30 2006
@@ -1,22 +1,26 @@
 # $Revision$, $Date$
+# http://gentoo-wiki.com/HOWTO_NTFS_write_with_Captive_approach
+# nice article about how to use it in gentoo, should be easy to prot to pld
+
+# please allow those bconds to remain here as next version might be gnome-vfs2 
independent
+# %bcond_without       vfs     # enable gnome2 cvs
 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.6.1
+Version:       1.1.7
 Release:       1
 License:       GPL
 Group:         Base/Kernel
 Source0:       
http://www.jankratochvil.net/project/captive/dist/%{name}-%{version}.tar.gz
-# Source0-md5: 81fcc21997cf46ad9440d1a1464a384e
-Patch0:                %{name}-non_root_install.patch
-Patch1:                %{name}-popt_link.patch
-Patch2:                %{name}-configure_ac.patch
+# Source0-md5: 34312cd854ca992f0daf0a8faabaae9a
+Patch0:                %{name}-popt_link.patch
 URL:           http://www.jankratochvil.net/project/captive/
-BuildRequires: ORBit2-devel
+#%if %{with vfs}
+BuildRequires: gnome-vfs2-devel >= 2.0
+#%endif
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gnome-vfs2-devel >= 2.0
 BuildRequires: libfuse-devel >= 2.4.1
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.9
@@ -25,6 +29,7 @@
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: ORBit2-devel
 BuildRequires: sed >= 4.0
 Provides:      group(captive)
 Provides:      user(captive)
@@ -78,11 +83,23 @@
 %description devel -l pl
 Ten pakiet zawiera pliki nagłówkowe biblioteki captive.
 
+%package gnome
+Summary:       Gnome vfs data for captive support
+Summary(pl):   Dane dla Gnome vfs z obsługą captive
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      gnome-vfs2 >= 2.0
+
+%description gnome
+Gnome vfs data for captive support.
+
+%description gnome -l pl
+Dane dla Gnome vfs z obsługą captive.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
 # Fix not finished moving captive-sandbox-server to libdir
 sed -i -e 's/[EMAIL PROTECTED]@/[EMAIL PROTECTED]@/g' 
src/client/gnomevfs/captive.conf.in
 
@@ -106,7 +123,7 @@
        --enable-man-pages \
        --enable-sbin-mountdir=/sbin \
        --enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
-       --with-oribt-line=link \
+       --with-oribt-line=link} \
        --with-tmpdir=/tmp
 
 %{__make}
@@ -140,11 +157,9 @@
 %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) %{_libdir}/captive-sandbox-server
-%{_sysconfdir}/gnome-vfs-2.0/modules/*
+%attr(755,root,root) %{_libdir}/captive-sandbox-server
 %{_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?/*
 %{_var}/lib/captive
 
@@ -154,12 +169,22 @@
 %{_libdir}/libcaptive.la
 %{_includedir}/captive
 
+#%if %{with vfs}
+%files gnome
+%defattr(644,root,root,755)
+%{_sysconfdir}/gnome-vfs-2.0/modules/*
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libcaptive-gnomevfs*.so
+#%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/02/01 17:01:30  djurban
+- works, updated to 1.1.7
+
 Revision 1.17  2006/01/27 11:11:00  darekr
 - BR sed4
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to