2015-05-08 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* ntfs-3g: reverted file location <Vine Linux:2914>
	


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

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

@@ -5,7 +5,7 @@ Summary(ja): 	Linux NTFS ユーザ空間ドライバ
 Name:		ntfs-3g
 
 Version:	2015.3.14
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 License:	GPLv2+
 Group:		System Environment/Base
@@ -75,6 +75,9 @@ installation).
            --disable-ldconfig \
 %{?with_ externalfuse:--with-fuse=external} \
 	   --exec-prefix=/ \
+	   --bindir=/bin \
+	   --sbindir=/sbin \
+	   --libdir=/%{_lib} \
 	   --enable-crypto \
 	   --enable-extras \
 	   --enable-quarantined
@@ -84,26 +87,28 @@ make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 %install
 rm -rf $RPM_BUILD_ROOT
 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.{la,a}
+
+mkdir -p $RPM_BUILD_ROOT/sbin
 
-rm -rf $RPM_BUILD_ROOT%{_sbindir}/mount.ntfs-3g
-cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT%{_sbindir}/mount.ntfs-3g
+# make the symlink an actual copy to avoid confusion
+rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
+cp -a $RPM_BUILD_ROOT/bin/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 
 # make compatibility symlinks
-pushd $RPM_BUILD_ROOT%{_bindir}
-ln -s ntfs-3g ntfsmount
-popd
-pushd $RPM_BUILD_ROOT%{_sbindir}
-ln -s mount.ntfs-3g mount.ntfs-fuse
-# And since there is no other package in Fedora that provides an ntfs 
-# mount...
-ln -s mount.ntfs-3g mount.ntfs
-# Need this for fsck to find it
-ln -s ../bin/ntfsck fsck.ntfs
-popd
-
-mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir}
-rm -rf $RPM_BUILD_ROOT/sbin
+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
+
+# Put the .pc file in the right place.
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
 # We get this on our own, thanks.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README
@@ -118,17 +123,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
-%{_sbindir}/mount.ntfs
-%{_sbindir}/mount.ntfs-3g
-%{_sbindir}/mount.ntfs-fuse
-%{_sbindir}/mount.lowntfs-3g
+/sbin/mount.ntfs
+%attr(4754,root,root) /sbin/mount.ntfs-3g
+/sbin/mount.ntfs-fuse
+/sbin/mount.lowntfs-3g
+/bin/lowntfs-3g
+/bin/ntfs-3g
+/bin/ntfs-3g.probe
+/bin/ntfs-3g.secaudit
+/bin/ntfs-3g.usermap
+/bin/ntfsmount
 %{_bindir}/ntfs-3g
 %{_bindir}/ntfsmount
-%{_bindir}/ntfs-3g.probe
-%{_bindir}/ntfs-3g.secaudit
-%{_bindir}/ntfs-3g.usermap
-%{_bindir}/lowntfs-3g
-%{_libdir}/libntfs-3g.so.*
+/%{_lib}/libntfs-3g.so.*
 %{_mandir}/man8/mount.lowntfs-3g.*
 %{_mandir}/man8/mount.ntfs-3g.*
 %{_mandir}/man8/ntfs-3g*
@@ -136,40 +143,43 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/ntfs-3g/
-%{_libdir}/libntfs-3g.so
+/%{_lib}/libntfs-3g.so
 %{_libdir}/pkgconfig/*.pc
 
 %files -n ntfsprogs
 %doc AUTHORS COPYING CREDITS ChangeLog NEWS README
-%{_bindir}/ntfscat
-%{_bindir}/ntfscluster
-%{_bindir}/ntfscmp
-%{_bindir}/ntfsfix
-%{_bindir}/ntfsinfo
-%{_bindir}/ntfsls
+/bin/ntfscat
+/bin/ntfscluster
+/bin/ntfscmp
+/bin/ntfsfix
+/bin/ntfsinfo
+/bin/ntfsls
 # extras
-%{_bindir}/ntfsck
-%{_bindir}/ntfsdecrypt
-%{_bindir}/ntfsdump_logfile
-%{_bindir}/ntfsfallocate
-%{_bindir}/ntfsmftalloc
-%{_bindir}/ntfsmove
-%{_bindir}/ntfstruncate
-%{_bindir}/ntfswipe
-%{_sbindir}/fsck.ntfs
-%{_sbindir}/mkfs.ntfs
-%{_sbindir}/mkntfs
-%{_sbindir}/ntfsclone
-%{_sbindir}/ntfscp
-%{_sbindir}/ntfslabel
-%{_sbindir}/ntfsresize
-%{_sbindir}/ntfsundelete
+/bin/ntfsck
+/bin/ntfsdecrypt
+/bin/ntfsdump_logfile
+/bin/ntfsfallocate
+/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*
 %exclude %{_mandir}/man8/ntfs-3g*
 
 %changelog
+* Fri May  8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2015.3.14-2
+- reverted file location <Vine Linux:2914>
+
 * Fri Apr 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2015.3.14-1
 - new upstream release
 - dropt hal files, since hal is very old