ntfs-3g:

- update to 2012.1.15
- merged with ntfsprogs (in upstream)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7076 ec354946-7b23-47d6-9f5a-488ba84defc7

n/ntfs-3g/ntfs-3g-vl.spec

@@ -1,15 +1,37 @@
+%bcond_with externalfuse
+
 Summary: 	Linux NTFS userspace driver 
 Summary(ja): 	Linux NTFS ユーザ空間ドライバ
 Name:		ntfs-3g
-Version:	2011.1.15
+
+Version:	2012.1.15
 Release:	1%{?_dist_release}
+
 License:	GPL
 Group:		System Environment/Base
-Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
-Source1:        20-ntfs-config-write-policy.fdi
 URL:		http://www.ntfs-3g.org/
+
+Source0:	http://www.ntfs-3g.org/%{name}_ntfsprogs-%{version}.tgz
+Source1:        20-ntfs-config-write-policy.fdi
+Patch0:         ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
+Patch1:         ntfs-3g-junction-point-fix.patch
+# Windows 8 safety checks
+Patch2:         ntfs-3g-4d0b9163c9ef1f0cdbbf533317b291220c7fd1c7.patch
+Patch3:         ntfs-3g-559270a8f67c77a7ce51246c23d2b2837bcff0c9.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires:  libtool
+BuildRequires:  libattr-devel
+BuildRequires:  libconfig-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  libuuid-devel
+%if %{with externalfuse}
+BuildRequires:  fuse-devel
+Requires:       fuse
+%endif
+
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
 Linux NTFS driver. It provides full read-write access to NTFS, excluding 
@@ -29,27 +51,52 @@ Summary:	Development files and libraries for ntfs-3g
 Summary(ja):	ntfs-3g の開発ファイルとライブラリ
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:       ntfsprogs-devel = %{version}-%{release}
+Obsoletes:      ntfsprogs-devel < 2.0.0-3
 
 %description devel
 Headers and libraries for developing applications that use ntfs-3g 
 functionality.
 
+%package -n ntfsprogs
+Summary:        NTFS filesystem libraries and utilities
+Summary(ja):    NTFS ファイルシステム用ライブラリおよびユーティリティ
+Group:          System Environment/Base
+Provides:       ntfsprogs-gnomevfs = %{version}-%{release}
+Obsoletes:      ntfsprogs-gnomevfs < 2.0.0-3
+
+%description -n ntfsprogs
+The ntfsprogs package currently consists of a library and utilities
+such as mkntfs, ntfscat, ntfsls, ntfsresize, and ntfsundelete
+(for a full list of included utilities see man 8 ntfsprogs after 
+installation).
+
+
 %prep
-%setup -q
+%setup -q -n %{name}_ntfsprogs-%{version}
+%patch0 -p1 -b .unsupported
+%patch1 -p1 -b .junction-fix
+%patch2 -p1 -b .4d0b9163
+%patch3 -p1 -b .559270a8
 
 %build
-%configure --disable-static --disable-ldconfig \
+%configure --disable-static \
+           --disable-ldconfig \
+%{?with_ externalfuse:--with-fuse=external} \
 	   --exec-prefix=/ \
 	   --bindir=/bin \
 	   --sbindir=/sbin \
-	   --libdir=/%{_lib}
-make %{?_smp_mflags}
+	   --libdir=/%{_lib} \
+	   --enable-crypto \
+	   --enable-extras
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool install
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+rm -f $RPM_BUILD_ROOT/%{_lib}/libntfs-3g.a
 
 # make the symlink an actual copy to avoid confusion
 rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
@@ -59,6 +106,7 @@ cp -a $RPM_BUILD_ROOT/bin/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 ln -s ntfs-3g $RPM_BUILD_ROOT/bin/ntfsmount
 ln -s mount.ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-fuse
 ln -s mount.ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs
+ln -s ../bin/ntfsck $RPM_BUILD_ROOT/sbin/fsck.ntfs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -s /bin/ntfs-3g $RPM_BUILD_ROOT%{_bindir}/ntfs-3g
 ln -s /bin/ntfsmount $RPM_BUILD_ROOT%{_bindir}/ntfsmount
@@ -67,6 +115,8 @@ ln -s /bin/ntfsmount $RPM_BUILD_ROOT%{_bindir}/ntfsmount
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
+
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 
@@ -97,8 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ntfsmount
 /%{_lib}/libntfs-3g.so.*
 %{_datadir}/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi
-%{_mandir}/man8/*
-
+%{_mandir}/man8/mount.lowntfs-3g.*
+%{_mandir}/man8/mount.ntfs-3g.*
+%{_mandir}/man8/ntfs-3g*
 
 %files devel
 %defattr(-,root,root,-)
@@ -106,7 +157,42 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libntfs-3g.so
 %{_libdir}/pkgconfig/*.pc
 
+%files -n ntfsprogs
+%doc AUTHORS COPYING CREDITS ChangeLog NEWS README
+/bin/ntfscat
+/bin/ntfscluster
+/bin/ntfscmp
+/bin/ntfsfix
+/bin/ntfsinfo
+/bin/ntfsls
+# extras
+/bin/ntfsck
+/bin/ntfsdecrypt
+/bin/ntfsdump_logfile
+/bin/ntfsmftalloc
+/bin/ntfsmove
+/bin/ntfstruncate
+/bin/ntfswipe
+/sbin/fsck.ntfs
+/sbin/mkfs.ntfs
+/sbin/mkntfs
+/sbin/ntfsclone
+/sbin/ntfscp
+/sbin/ntfslabel
+/sbin/ntfsresize
+/sbin/ntfsundelete
+%{_mandir}/man8/mkntfs.8*
+%{_mandir}/man8/mkfs.ntfs.8*
+%{_mandir}/man8/ntfs[^m][^o]*.8*
+
+
 %changelog
+* Mon Nov 05 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2012.1.15-1
+- new upstream release
+- merge ntfsprogs
+  - add Obsoletes and Provides ntfsprogs*
+  - add BR: for ntfsprogs
+
 * Sat Feb 26 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2011.1.15-1
 - new upstream release
 - fix %%files (add lowntfs-3g)