Accepting request 113288 from home:rjschwei:branches:filesystems

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/113288
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=25

e2fsprogs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 11 21:14:32 UTC 2012 - rschweikert@suse.com
+
+- place binaries and libraries into the /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Thu Apr  5 21:39:06 UTC 2012 - jengelh@medozas.de
 

e2fsprogs.spec

@@ -139,10 +139,7 @@ bunzip2 -dc %{S:4} > po/de.po
 
 %build
 autoreconf --force --install
-./configure --prefix=%{_prefix} \
+%configure \
-  --mandir=%{_mandir} \
-  --infodir=%{_infodir} \
-  --libdir=%{_libdir} \
   --disable-evms \
   --with-root-prefix=''   \
   --enable-elf-shlibs \
@@ -156,11 +153,11 @@ make %{?_smp_mflags} V=1
 make -C po update-po
 
 %install
-make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
+make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
 %{find_lang} %{name}
 rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
-rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev
+rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
-rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev
+rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev
 rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
 rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
 rm -v %{buildroot}%{_includedir}/quota/mkquota.h
@@ -172,7 +169,33 @@ find "%buildroot/%_libdir" -type f -name "*.a" \
 	! -name libext2fs.a \
 %endif
 	-print -delete
-
+#UsrMerge
+mkdir %{buildroot}/sbin
+ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
+ln -s %{_sbindir}/debugfs   %{buildroot}/sbin/debugfs
+ln -s %{_sbindir}/dumpe2fs  %{buildroot}/sbin/dumpe2fs
+ln -s %{_sbindir}/e2undo    %{buildroot}/sbin/e2undo
+ln -s %{_sbindir}/e2fsck    %{buildroot}/sbin/e2fsck
+ln -s %{_sbindir}/e2label   %{buildroot}/sbin/e2label
+ln -s %{_sbindir}/fsck.ext2 %{buildroot}/sbin/fsck.ext2
+ln -s %{_sbindir}/fsck.ext3 %{buildroot}/sbin/fsck.ext3
+ln -s %{_sbindir}/fsck.ext4 %{buildroot}/sbin/fsck.ext4
+ln -s %{_sbindir}/mke2fs    %{buildroot}/sbin/mke2fs
+ln -s %{_sbindir}/mkfs.ext2 %{buildroot}/sbin/mkfs.ext2
+ln -s %{_sbindir}/mkfs.ext3 %{buildroot}/sbin/mkfs.ext3
+ln -s %{_sbindir}/mkfs.ext4 %{buildroot}/sbin/mkfs.ext4
+ln -s %{_sbindir}/resize2fs %{buildroot}/sbin/resize2fs
+ln -s %{_sbindir}/tune2fs   %{buildroot}/sbin/tune2fs
+ln -s %{_sbindir}/e2image   %{buildroot}/sbin/e2image
+ln -s %{_sbindir}/logsave   %{buildroot}/sbin/logsave
+mkdir %{buildroot}/%{_lib}
+pushd %{buildroot}/%{_libdir}
+LIBNAMES=$(ls *.so.*)
+popd
+for libName in $LIBNAMES;
+  do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
+done
+#EndUsrMerge
 %post
 /sbin/ldconfig
 %install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
@@ -193,6 +216,7 @@ find "%buildroot/%_libdir" -type f -name "*.a" \
 %defattr(-, root, root)
 %doc RELEASE-NOTES README
 %config /etc/mke2fs.conf
+#UsrMerge 
 /sbin/badblocks
 /sbin/debugfs
 /sbin/dumpe2fs
@@ -210,12 +234,30 @@ find "%buildroot/%_libdir" -type f -name "*.a" \
 /sbin/tune2fs
 /sbin/e2image
 /sbin/logsave
-/usr/bin/chattr
+#EndUsrMerge
-/usr/bin/lsattr
+%{_sbindir}/badblocks
-/usr/sbin/mklost+found
+%{_sbindir}/debugfs
-/usr/sbin/filefrag
+%{_sbindir}/dumpe2fs
-/usr/sbin/e2freefrag
+%{_sbindir}/e2undo
-/usr/sbin/e4defrag
+%{_sbindir}/e2fsck
+%{_sbindir}/e2label
+%{_sbindir}/fsck.ext2
+%{_sbindir}/fsck.ext3
+%{_sbindir}/fsck.ext4
+%{_sbindir}/mke2fs
+%{_sbindir}/mkfs.ext2
+%{_sbindir}/mkfs.ext3
+%{_sbindir}/mkfs.ext4
+%{_sbindir}/resize2fs
+%{_sbindir}/tune2fs
+%{_sbindir}/e2image
+%{_sbindir}/logsave 
+%{_bindir}/chattr
+%{_bindir}/lsattr
+%{_sbindir}/mklost+found
+%{_sbindir}/filefrag
+%{_sbindir}/e2freefrag
+%{_sbindir}/e4defrag
 %{_infodir}/libext2fs.info.gz
 %{_mandir}/man1/chattr.1.gz
 %{_mandir}/man1/lsattr.1.gz
@@ -229,8 +271,12 @@ find "%buildroot/%_libdir" -type f -name "*.a" \
 
 %files -n libext2fs2
 %defattr(-, root, root)
+#UsrMerge
 /%{_lib}/libext2fs.so.*
 /%{_lib}/libe2p.so.*
+#EndUsrMerge
+%{_libdir}/libext2fs.so.*
+%{_libdir}/libe2p.so.*
 
 %files -n libext2fs-devel
 %defattr(-, root, root)
@@ -246,8 +292,12 @@ find "%buildroot/%_libdir" -type f -name "*.a" \
 
 %files -n libcom_err2
 %defattr(-, root, root)
+#UsrMerge
 /%{_lib}/libcom_err.so.*
 /%{_lib}/libss.so.*
+#EndUsrMerge
+%{_libdir}/libcom_err.so.*
+%{_libdir}/libss.so.*
 
 %files -n libcom_err-devel
 %defattr(-, root, root)