Accepting request 112741 from home:jengelh:branches:filesystems

- SPARC: avoid retention of libquota.a
- Remove redundant tags/sections from specfile

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

e2fsprogs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

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.
@@ -160,16 +163,15 @@ rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev
 rm -f $RPM_BUILD_ROOT/sbin/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
 
 %post
 /sbin/ldconfig