Accepting request 113290 from filesystems
usrMerge project - move files from toplevel to /usr (forwarded request 113288 from rjschwei) OBS-URL: https://build.opensuse.org/request/show/113290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=68
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
6f7f4abb5b
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- SPARC: avoid retention of libquota.a
|
||||
- Remove redundant tags/sections from specfile
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 15:44:27 UTC 2012 - tabraham@novell.com
|
||||
|
||||
|
||||
102
e2fsprogs.spec
102
e2fsprogs.spec
@ -16,7 +16,6 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: e2fsprogs
|
||||
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
|
||||
BuildRequires: autoconf
|
||||
@ -68,7 +67,9 @@ Group: Development/Libraries/C and C++
|
||||
Obsoletes: e2fsprogs-devel-64bit
|
||||
%endif
|
||||
#
|
||||
Requires: libext2fs-devel = %version libblkid-devel libuuid-devel
|
||||
Requires: libblkid-devel
|
||||
Requires: libext2fs-devel = %version
|
||||
Requires: libuuid-devel
|
||||
|
||||
%description devel
|
||||
Dummy development package for backwards compatibility.
|
||||
@ -85,7 +86,8 @@ The basic Ext2fs shared library.
|
||||
Summary: Development files for libext2fs
|
||||
License: LGPL-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libext2fs2 = %version libcom_err-devel
|
||||
Requires: libcom_err-devel
|
||||
Requires: libext2fs2 = %version
|
||||
|
||||
%description -n libext2fs-devel
|
||||
Development files for libext2fs.
|
||||
@ -115,7 +117,8 @@ Group: Development/Libraries/C and C++
|
||||
Obsoletes: libcom_err-devel-64bit
|
||||
%endif
|
||||
#
|
||||
Requires: libcom_err2 = %version glibc-devel
|
||||
Requires: glibc-devel
|
||||
Requires: libcom_err2 = %version
|
||||
|
||||
%description -n libcom_err-devel
|
||||
Development files for the com_err error message display library.
|
||||
@ -136,10 +139,7 @@ bunzip2 -dc %{S:4} > po/de.po
|
||||
|
||||
%build
|
||||
autoreconf --force --install
|
||||
./configure --prefix=%{_prefix} \
|
||||
--mandir=%{_mandir} \
|
||||
--infodir=%{_infodir} \
|
||||
--libdir=%{_libdir} \
|
||||
%configure \
|
||||
--disable-evms \
|
||||
--with-root-prefix='' \
|
||||
--enable-elf-shlibs \
|
||||
@ -153,24 +153,49 @@ 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/sbin/fsck.ext4dev
|
||||
rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.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*
|
||||
%ifarch %sparc
|
||||
rm -v %{buildroot}%{_libdir}/lib{com,e2p,ss}*.a
|
||||
%else
|
||||
rm -v %{buildroot}%{_libdir}/*.a
|
||||
%endif
|
||||
rm -v %{buildroot}%{_includedir}/quota/mkquota.h
|
||||
rm -v %{buildroot}%{_libdir}/pkgconfig/quota.pc
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# Need libext2fs.a for silo
|
||||
find "%buildroot/%_libdir" -type f -name "*.a" \
|
||||
%ifarch %sparc
|
||||
! -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
|
||||
@ -191,6 +216,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%defattr(-, root, root)
|
||||
%doc RELEASE-NOTES README
|
||||
%config /etc/mke2fs.conf
|
||||
#UsrMerge
|
||||
/sbin/badblocks
|
||||
/sbin/debugfs
|
||||
/sbin/dumpe2fs
|
||||
@ -208,12 +234,30 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/sbin/tune2fs
|
||||
/sbin/e2image
|
||||
/sbin/logsave
|
||||
/usr/bin/chattr
|
||||
/usr/bin/lsattr
|
||||
/usr/sbin/mklost+found
|
||||
/usr/sbin/filefrag
|
||||
/usr/sbin/e2freefrag
|
||||
/usr/sbin/e4defrag
|
||||
#EndUsrMerge
|
||||
%{_sbindir}/badblocks
|
||||
%{_sbindir}/debugfs
|
||||
%{_sbindir}/dumpe2fs
|
||||
%{_sbindir}/e2undo
|
||||
%{_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
|
||||
@ -227,8 +271,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%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)
|
||||
@ -244,8 +292,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user