From 6f8284d45abffb4b379fd5042b0db11bc1093b6e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 5 Aug 2015 12:31:46 +0000 Subject: [PATCH] Accepting request 320148 from home:dsterba:branches:filesystems - enable static build and package static libraries OBS-URL: https://build.opensuse.org/request/show/320148 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=66 --- e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index ecbda57..eef7564 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 27 00:00:00 CEST 2015 - dsterba@suse.com + +- enable static build and package static libraries + ------------------------------------------------------------------- Sat Jun 20 23:33:05 UTC 2015 - crrodriguez@opensuse.org diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 958c099..6bf2d25 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -137,6 +137,16 @@ Requires: libext2fs2 = %version %endif Development files for libext2fs. +%if ! %{build_mini} +%package -n libext2fs-devel-static +Summary: Development files for libext2fs +License: LGPL-2.0 +Group: Development/Libraries/C and C++ + +%description -n libext2fs-devel-static +Development files for libext2fs. Static libraries. +%endif + %if %{build_mini} %package -n libcom_err2-mini %else @@ -184,6 +194,21 @@ Requires: libcom_err2 = %version %endif Development files for the com_err error message display library. +%if ! %{build_mini} +%package -n libcom_err-devel-static +Summary: Development files for libcom_err, static libraries +License: MIT +Group: Development/Libraries/C and C++ +# bug437293 +%ifarch ppc64 +Obsoletes: libcom_err-devel-64bit +%endif +# + +%description -n libcom_err-devel-static +Development files for the com_err error message display library. Static libraries. +%endif + %prep %setup -q -n e2fsprogs-%{version} # e2fsprogs patches @@ -203,6 +228,7 @@ autoreconf --force --install --disable-libuuid \ --disable-uuidd \ --disable-fsck \ + --enable-static \ CFLAGS="$RPM_OPT_FLAGS" %if %{build_mini} rm -rf doc @@ -222,12 +248,6 @@ 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* -# 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 @@ -371,9 +391,6 @@ done %endif %defattr(-, root, root) %{_libdir}/libext2fs.so -%ifarch %sparc -%{_libdir}/libext2fs.a -%endif %{_libdir}/libe2p.so /usr/include/ext2fs /usr/include/e2p @@ -414,4 +431,16 @@ done %{_mandir}/man1/mk_cmds.1.gz %{_mandir}/man3/com_err.3.gz +%if ! %{build_mini} +%files -n libcom_err-devel-static +%defattr(-, root, root) +%{_libdir}/libcom_err.a +%{_libdir}/libss.a + +%files -n libext2fs-devel-static +%defattr(-, root, root) +%{_libdir}/libext2fs.a +%{_libdir}/libe2p.a +%endif + %changelog