diff --git a/openmamba-lsb.spec b/openmamba-lsb.spec index 1499a44..3c29031 100644 --- a/openmamba-lsb.spec +++ b/openmamba-lsb.spec @@ -18,13 +18,20 @@ %define qual ()(64bit) %endif +%ifarch aarch64 +%define ldso ld-linux-aarch64.so.1 +%define lsb_proginterp /lib64/ld-lsb-aarch64.so.3 +%define lsb_archname aarch64 +%define qual ()(64bit) +%endif + # See: # https://ldn.linuxfoundation.org/lsb/lsb4-resource-page # http://www.linuxbase.org/navigator/browse/module.php Name: openmamba-lsb Version: 4.1 -Release: 4mamba +Release: 5mamba Summary: Linux Standard Base Core (%{lsb_archname}) Group: System/Configuration Vendor: openmamba @@ -58,7 +65,6 @@ BuildRequires: libnspr-devel BuildRequires: libnss-devel BuildRequires: libpango-devel BuildRequires: libpng12-devel -BuildRequires: libqt3-devel BuildRequires: libqt4-devel BuildRequires: libSM-devel BuildRequires: libstdc++6-devel @@ -90,7 +96,7 @@ Provides: lsb-%{lsb_archname} = %{version} Provides: lsb-noarch = %{version} # Obsoletes: lsb < 4.1 -ExclusiveArch: %{ix86} x86_64 ia64 arm +ExclusiveArch: %{ix86} x86_64 ia64 arm aarch64 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -114,7 +120,7 @@ Obsoletes: lsb-security Provides: /usr/bin/lsb_release Provides: /usr/lib/lsb/install_initd Provides: /usr/lib/lsb/remove_initd -Provides: /lib/lsb/init-functions +Provides: /usr/lib/lsb/init-functions # See: # Module LSB-Core # \ SubModule LSB_Core (Core LSB Specification) @@ -333,12 +339,7 @@ Requires: %{name}-core = %{?epoch:epoch:}%{version}-%{release} # See: # Module LSB-CXX # \ SubModule LSB_Cpp (LSB C++ module) -%ifarch %{ix86} arm -Requires: libstdc++.so.6 -%endif -%ifarch x86_64 -Requires: libstdc++.so.6()(64bit) -%endif +Requires: libstdc++.so.6%{qual} %description cxx The goal of the Linux Standards Base (LSB) is to develop and promote a set of binary standards that will increase compatibility among Linux systems (and other similar systems), and enable software applications to run on any conforming system. @@ -420,10 +421,6 @@ Requires: libQtOpenGL.so.4%{qual} Requires: libQtSql.so.4%{qual} Requires: libQtSvg.so.4%{qual} -# Module LSB-Desktop -# \ SubModule LSB_Toolkit_Qt3 (LSB Qt3 Toolkit module) ** Deprecated since LSB 3.2 -Requires: libqt-mt.so.3%{qual} - # Module LSB-Desktop # \ SubModule LSB_XML (LSB XML module) Requires: libxml2.so.2%{qual} @@ -819,7 +816,6 @@ install -d %{buildroot}/sbin/ install -d %{buildroot}/var/cache/fonts install -d %{buildroot}/var/games install -d %{buildroot}/%{_lib} -install -d %{buildroot}/lib/lsb install -d %{buildroot}%{_prefix}/lib/lsb %makeoldinstall @@ -838,10 +834,10 @@ for lsb_module in core desktop printing; do touch %{buildroot}%{_sysconfdir}/lsb-release.d/${lsb_module}-%{version}-%{lsb_archname} done -install -m 644 %{S:1} %{buildroot}/lib/lsb/init-functions +install -m 644 %{S:1} %{buildroot}%{_prefix}/lib/lsb/init-functions -ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/install_initd -ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd +ln -snf ../../../sbin/chkconfig %{buildroot}%{_prefix}/lib/lsb/install_initd +ln -snf ../../../sbin/chkconfig %{buildroot}%{_prefix}/lib/lsb/remove_initd for lsbver in %{lsbsover}; do ln -s %{ldso} %{buildroot}%{lsb_proginterp} @@ -864,10 +860,8 @@ EOF %defattr(-, root, root) %{_bindir}/lsb_release %{lsb_proginterp} -%dir /lib/lsb -/lib/lsb/init-functions -%dir /usr/lib/lsb -/usr/lib/lsb/* +%dir %{_prefix}/lib/lsb +%{_prefix}/lib/lsb/* %{_sysconfdir}/lsb-release %dir %{_sysconfdir}/lsb-release.d %{_sysconfdir}/lsb-release.d/core-* @@ -889,6 +883,9 @@ EOF %{_sysconfdir}/lsb-release.d/printing-* %changelog +* Thu Aug 01 2019 Silvan Calarco 4.1-5mamba +- move /lib/lsb to /usr/lib/lsb for usr merge + * Sun Nov 27 2016 Silvan Calarco 4.1-4mamba - removed requirements for upstream obsoleted perl(CGI::Apache) and perl(CGI::Switch)