From ecf50d4a234e27fef1bbcfd0e4fdd2d62fd45070187df14f741fe11997f5417e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 20 Sep 2011 12:45:58 +0000 Subject: [PATCH] Accepting request 83777 from home:jengelh:bl Resubmit of 82561 after adding provides/obsoletes. - Implement shlib package (libacl1) - Enable libacl-devel on all baselib arches OBS-URL: https://build.opensuse.org/request/show/83777 OBS-URL: https://build.opensuse.org/package/show/Base:System/acl?expand=0&rev=18 --- acl.changes | 6 ++++++ acl.spec | 18 +++++++++--------- baselibs.conf | 11 ++++++++--- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/acl.changes b/acl.changes index ea3a781..4927e24 100644 --- a/acl.changes +++ b/acl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 16 18:37:51 UTC 2011 - jengelh@medozas.de + +- Implement shlib package (libacl1) +- Enable libacl-devel on all baselib arches + ------------------------------------------------------------------- Tue Apr 19 18:05:44 UTC 2011 - bphilips@novell.com diff --git a/acl.spec b/acl.spec index 16059b0..5c1f284 100644 --- a/acl.spec +++ b/acl.spec @@ -19,6 +19,7 @@ Name: acl +%define lname libacl1 BuildRequires: libattr-devel Group: System/Filesystems AutoReqProv: on @@ -42,7 +43,7 @@ Authors: Andreas Gruenbacher SGI -%package -n libacl +%package -n %lname License: GPLv2+ ; LGPLv2.1+ Summary: A dynamic library for accessing POSIX Access Control Lists Group: System/Libraries @@ -51,8 +52,10 @@ Group: System/Libraries Obsoletes: libacl-64bit %endif # +Provides: libacl < %version-%release +Obsoletes: libacl = %version-%release -%description -n libacl +%description -n %lname This package contains the libacl.so dynamic library which contains the POSIX 1003.1e draft standard 17 functions for manipulating access control lists. @@ -67,7 +70,7 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development AutoReqProv: on Group: Development/Libraries/C and C++ -Requires: libacl = %{version} glibc-devel +Requires: %lname = %version, glibc-devel # the .so file references libattr.so.x, so require libattr-devel Requires: libattr-devel Provides: acl-devel @@ -121,12 +124,9 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB %{__rm} -v %{buildroot}/%{_lib}/lib%{name}.{la,so} %find_lang %name -%clean -rm -rf $RPM_BUILD_ROOT +%post -n %lname -p /sbin/ldconfig -%post -n libacl -p /sbin/ldconfig - -%postun -n libacl -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files -f %name.lang %defattr(-,root,root) @@ -190,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT %doc %attr(644,root,root) %{_mandir}/man3/acl_valid.3.gz %doc %attr(644,root,root) %{_mandir}/man3/acl_extended_file_nofollow.3.gz -%files -n libacl +%files -n %lname %defattr(755,root,root,755) /%{_lib}/libacl.so.1* diff --git a/baselibs.conf b/baselibs.conf index 9a33c92..02c052f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,8 @@ -libacl -arch ppc package libacl-devel -arch sparcv9 package libacl-devel +# added in 2.2.51; change to just "<" with 2.2.52 or up. +libacl1 + obsoletes "libacl- <= " + provides "libacl- = " +libacl-devel + requires -libacl- + requires "libacl1- = " +