split out a separate -libs subpackage
split out a separate -libs subpackage - 389-ds-base-libs contains libslapd.so.* (and owns the libdir) - 389-ds-base-devel contains libslapd.so (the symlink) and the header and pkgconfig files 389-ds-base contains everything else 389-ds-base and 389-ds-base-devel both depend on 389-ds-base-libs but do not depend on each other
This commit is contained in:
parent
31909e6aa2
commit
5142ec0838
@ -16,7 +16,7 @@
|
|||||||
Summary: 389 Directory Server (base)
|
Summary: 389 Directory Server (base)
|
||||||
Name: 389-ds-base
|
Name: 389-ds-base
|
||||||
Version: 1.2.8
|
Version: 1.2.8
|
||||||
Release: %{?relprefix}4%{?prerel}%{?dist}
|
Release: %{?relprefix}5%{?prerel}%{?dist}
|
||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
URL: http://port389.org/
|
URL: http://port389.org/
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -25,6 +25,7 @@ Provides: fedora-ds-base = %{version}-%{release}
|
|||||||
Obsoletes: fedora-ds-base < 1.2.1-1
|
Obsoletes: fedora-ds-base < 1.2.1-1
|
||||||
Obsoletes: %{name}-selinux
|
Obsoletes: %{name}-selinux
|
||||||
Conflicts: selinux-policy-base < 3.9.8
|
Conflicts: selinux-policy-base < 3.9.8
|
||||||
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
BuildRequires: nspr-devel
|
BuildRequires: nspr-devel
|
||||||
BuildRequires: nss-devel
|
BuildRequires: nss-devel
|
||||||
@ -95,11 +96,35 @@ Source2: %{name}-devel.README
|
|||||||
389 Directory Server is an LDAPv3 compliant server. The base package includes
|
389 Directory Server is an LDAPv3 compliant server. The base package includes
|
||||||
the LDAP server and command line utilities for server administration.
|
the LDAP server and command line utilities for server administration.
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: Core libraries for 389 Directory Server
|
||||||
|
Group: System Environment/Daemons
|
||||||
|
BuildRequires: nspr-devel
|
||||||
|
BuildRequires: nss-devel
|
||||||
|
BuildRequires: svrcore-devel
|
||||||
|
%if %{use_openldap}
|
||||||
|
BuildRequires: openldap-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: mozldap-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: db4-devel
|
||||||
|
BuildRequires: cyrus-sasl-devel
|
||||||
|
BuildRequires: libicu-devel
|
||||||
|
BuildRequires: pcre-devel
|
||||||
|
|
||||||
|
%description libs
|
||||||
|
Core libraries for the 389 Directory Server base package. These libraries
|
||||||
|
are used by the main package and the -devel package. This allows the -devel
|
||||||
|
package to be installed with just the -libs package and without the main package.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development libraries for 389 Directory Server
|
Summary: Development libraries for 389 Directory Server
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
|
Requires: nspr-devel
|
||||||
|
Requires: nss-devel
|
||||||
|
Requires: svrcore-devel
|
||||||
%if %{use_openldap}
|
%if %{use_openldap}
|
||||||
Requires: openldap-devel
|
Requires: openldap-devel
|
||||||
%else
|
%else
|
||||||
@ -229,8 +254,7 @@ exit 0
|
|||||||
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
|
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%dir %{_libdir}/%{pkgname}
|
%{_libdir}/%{pkgname}/libns-dshttpd.so*
|
||||||
%{_libdir}/%{pkgname}/*.so.*
|
|
||||||
%{_libdir}/%{pkgname}/perl
|
%{_libdir}/%{pkgname}/perl
|
||||||
%dir %{_libdir}/%{pkgname}/plugins
|
%dir %{_libdir}/%{pkgname}/plugins
|
||||||
%{_libdir}/%{pkgname}/plugins/*.so
|
%{_libdir}/%{pkgname}/plugins/*.so
|
||||||
@ -244,10 +268,20 @@ exit 0
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
|
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
|
||||||
%{_includedir}/%{pkgname}
|
%{_includedir}/%{pkgname}
|
||||||
%{_libdir}/%{pkgname}/*.so
|
%{_libdir}/%{pkgname}/libslapd.so
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
|
||||||
|
%dir %{_libdir}/%{pkgname}
|
||||||
|
%{_libdir}/%{pkgname}/libslapd.so.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 28 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.8-0.5.a3
|
||||||
|
- Bug 676598 - 389-ds-base multilib: file conflicts
|
||||||
|
- split off libs into a separate -libs package
|
||||||
|
|
||||||
* Thu Feb 24 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.8-0.4.a3
|
* Thu Feb 24 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.8-0.4.a3
|
||||||
- do not create /var/run/dirsrv - setup will create it instead
|
- do not create /var/run/dirsrv - setup will create it instead
|
||||||
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore
|
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore
|
||||||
|
Loading…
Reference in New Issue
Block a user