From 816b7971c477222a542bf36412f430f5efb9d03f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 1 Feb 2012 22:39:02 +0100 Subject: [PATCH] install everything in /usr This patch is needed for the /usr-move feature https://fedoraproject.org/wiki/Features/UsrMove This package requires now 'filesystem' >= 3, which is only installable on a system which has /bin, /sbin, /lib, /lib64 as symlinks to /usr and not regular directories. The 'filesystem' package acts as a guard, to prevent *this* package to be installed on old unconverted systems. New installations will have the 'filesystem' >=3 layout right away, old installations need to be converted with anaconda or dracut first; only after that, the 'filesystem' package, and also *this* package can be installed. Packages *should* not install files in /bin, /sbin, /lib, /lib64, but only in the corresponding directories in /usr. Packages *must* not install conflicting files with the same names in the corresponding directories in / and /usr. Especially compatibilty symlinks must not be installed. Feel free to modify any of the changes to the spec file, but keep the above in mind. --- ntfs-3g.spec | 103 +++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/ntfs-3g.spec b/ntfs-3g.spec index ac0b338..d1a655a 100644 --- a/ntfs-3g.spec +++ b/ntfs-3g.spec @@ -8,7 +8,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver Version: 2011.10.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://tuxera.com/opensource/%{name}_ntfsprogs-%{version}%{?subver}.tgz @@ -77,28 +77,24 @@ CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" --with-fuse=external \ %endif --exec-prefix=/ \ - --bindir=/bin \ - --sbindir=/sbin \ --enable-crypto \ - --enable-extras \ - --libdir=/%{_lib} + --enable-extras make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool %install make LIBTOOL=%{_bindir}/libtool DESTDIR=%{buildroot} install -rm -rf %{buildroot}/%{_lib}/*.la -rm -rf %{buildroot}/%{_lib}/*.a +rm -rf %{buildroot}%{_libdir}/*.la +rm -rf %{buildroot}%{_libdir}/*.a -# make the symlink an actual copy to avoid confusion -rm -rf %{buildroot}/sbin/mount.ntfs-3g -cp -a %{buildroot}/bin/ntfs-3g %{buildroot}/sbin/mount.ntfs-3g +rm -rf %{buildroot}/%{_sbindir}/mount.ntfs-3g +cp -a %{buildroot}/%{_bindir}/ntfs-3g %{buildroot}/%{_sbindir}/mount.ntfs-3g # Actually make some symlinks for simplicity... # ... since we're obsoleting ntfsprogs-fuse -pushd %{buildroot}/bin +pushd %{buildroot}/%{_bindir} ln -s ntfs-3g ntfsmount popd -pushd %{buildroot}/sbin +pushd %{buildroot}/%{_sbindir} ln -s mount.ntfs-3g mount.ntfs-fuse # And since there is no other package in Fedora that provides an ntfs # mount... @@ -106,17 +102,8 @@ ln -s mount.ntfs-3g mount.ntfs # Need this for fsck to find it ln -s ../bin/ntfsck fsck.ntfs popd - -# Compat symlinks -mkdir -p %{buildroot}%{_bindir} -pushd %{buildroot}%{_bindir} -ln -s /bin/ntfs-3g ntfs-3g -ln -s /bin/ntfsmount ntfsmount -popd - -# Put the .pc file in the right place. -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}/%{_lib}/pkgconfig/libntfs-3g.pc %{buildroot}%{_libdir}/pkgconfig/ +mv %{buildroot}/sbin/* %{buildroot}/%{_sbindir} +rmdir %{buildroot}/sbin # We get this on our own, thanks. rm -rf %{buildroot}%{_defaultdocdir}/%{name}/README @@ -129,19 +116,19 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ %files %doc AUTHORS ChangeLog COPYING CREDITS NEWS README -/sbin/mount.ntfs -%attr(754,root,root) /sbin/mount.ntfs-3g -/sbin/mount.ntfs-fuse -/sbin/mount.lowntfs-3g -/bin/ntfs-3g -/bin/ntfsmount -/bin/ntfs-3g.probe -/bin/ntfs-3g.secaudit -/bin/ntfs-3g.usermap -/bin/lowntfs-3g +%{_sbindir}/mount.ntfs +%attr(754,root,root) %{_sbindir}/mount.ntfs-3g +%{_sbindir}/mount.ntfs-fuse +%{_sbindir}/mount.lowntfs-3g %{_bindir}/ntfs-3g %{_bindir}/ntfsmount -/%{_lib}/libntfs-3g.so.* +%{_bindir}/ntfs-3g.probe +%{_bindir}/ntfs-3g.secaudit +%{_bindir}/ntfs-3g.usermap +%{_bindir}/lowntfs-3g +%{_bindir}/ntfs-3g +%{_bindir}/ntfsmount +%{_libdir}/libntfs-3g.so.* %{_mandir}/man8/mount.lowntfs-3g.* %{_mandir}/man8/mount.ntfs-3g.* %{_mandir}/man8/ntfs-3g* @@ -149,38 +136,42 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ %files devel %{_includedir}/ntfs-3g/ -/%{_lib}/libntfs-3g.so +%{_libdir}/libntfs-3g.so %{_libdir}/pkgconfig/libntfs-3g.pc %files -n ntfsprogs %doc AUTHORS COPYING CREDITS ChangeLog NEWS README -/bin/ntfscat -/bin/ntfscluster -/bin/ntfscmp -/bin/ntfsfix -/bin/ntfsinfo -/bin/ntfsls +%{_bindir}/ntfscat +%{_bindir}/ntfscluster +%{_bindir}/ntfscmp +%{_bindir}/ntfsfix +%{_bindir}/ntfsinfo +%{_bindir}/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 +%{_bindir}/ntfsck +%{_bindir}/ntfsdecrypt +%{_bindir}/ntfsdump_logfile +%{_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 %{_mandir}/man8/mkntfs.8* %{_mandir}/man8/mkfs.ntfs.8* %{_mandir}/man8/ntfs[^m][^o]*.8* %changelog +* Wed Feb 1 2012 Kay Sievers 2:2011.10.9-3 +- install everything in /usr + https://fedoraproject.org/wiki/Features/UsrMove + * Fri Jan 13 2012 Fedora Release Engineering - 2:2011.10.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild