commit de701fa5fa1c07b492cde337b0e6ec08b0c12a78
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon Feb 28 15:19:40 2011 -0700
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
389-ds-base.spec | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 66d2159..1eee739 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -18,7 +18,7 @@
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 1.2.8
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
License: GPLv2 with exceptions
URL: http://port389.org/
Group: System Environment/Daemons
@@ -26,6 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: fedora-ds-base = %{version}-%{release}
Obsoletes: fedora-ds-base < 1.2.1-1
Obsoletes: %{name}-selinux
+Requires: %{name}-libs = %{version}-%{release}
BuildRequires: nspr-devel
BuildRequires: nss-devel
@@ -106,11 +107,35 @@ Source2: %{name}-devel.README
389 Directory Server is an LDAPv3 compliant server. The base package includes
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
Summary: Development libraries for 389 Directory Server
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Requires: nspr-devel
+Requires: nss-devel
+Requires: svrcore-devel
%if %{use_openldap}
Requires: openldap-devel
%else
@@ -293,8 +318,7 @@ exit 0
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
@@ -308,14 +332,25 @@ exit 0
%defattr(-,root,root,-)
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%{_includedir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so
+%{_libdir}/%{pkgname}/libslapd.so
%{_libdir}/pkgconfig/*
+
%files selinux-devel
%defattr(-,root,root,-)
%{_datadir}/%{pkgname}-selinux
+%files libs
+%defattr(-,root,root,-)
+%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
+%dir %{_libdir}/%{pkgname}
+%{_libdir}/%{pkgname}/libslapd.so.*
+
%changelog
+* Mon Feb 28 2011 Rich Megginson <rmeggins(a)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(a)redhat.com> - 1.2.8-0.4.a3
- do not create /var/run/dirsrv - setup will create it instead
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore
commit bd98a8565a880963d1689642ac566622e2d0359c
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon Feb 28 15:19:40 2011 -0700
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
389-ds-base.spec | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 5406e71..2ef8527 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -17,7 +17,7 @@
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 1.2.8
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
License: GPLv2 with exceptions
URL: http://port389.org/
Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Provides: fedora-ds-base = %{version}-%{release}
Obsoletes: fedora-ds-base < 1.2.1-1
Obsoletes: %{name}-selinux
Conflicts: selinux-policy-base < 3.7.19-72
+Requires: %{name}-libs = %{version}-%{release}
BuildRequires: nspr-devel
BuildRequires: nss-devel
@@ -96,11 +97,35 @@ Source2: %{name}-devel.README
389 Directory Server is an LDAPv3 compliant server. The base package includes
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
Summary: Development libraries for 389 Directory Server
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Requires: nspr-devel
+Requires: nss-devel
+Requires: svrcore-devel
%if %{use_openldap}
Requires: openldap-devel
%else
@@ -230,8 +255,7 @@ exit 0
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
@@ -245,10 +269,20 @@ exit 0
%defattr(-,root,root,-)
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%{_includedir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so
+%{_libdir}/%{pkgname}/libslapd.so
%{_libdir}/pkgconfig/*
+%files libs
+%defattr(-,root,root,-)
+%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
+%dir %{_libdir}/%{pkgname}
+%{_libdir}/%{pkgname}/libslapd.so.*
+
%changelog
+* Mon Feb 28 2011 Rich Megginson <rmeggins(a)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(a)redhat.com> - 1.2.8-0.4.a3
- do not create /var/run/dirsrv - setup will create it instead
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore
commit 61135add18cd019bf5fdbd001a994e6b97780859
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon Feb 28 15:19:40 2011 -0700
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
389-ds-base.spec | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index d55adc1..1a3534f 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -16,7 +16,7 @@
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 1.2.8
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
License: GPLv2 with exceptions
URL: http://port389.org/
Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Provides: fedora-ds-base = %{version}-%{release}
Obsoletes: fedora-ds-base < 1.2.1-1
Obsoletes: %{name}-selinux
Conflicts: selinux-policy-base < 3.9.7-11
+Requires: %{name}-libs = %{version}-%{release}
BuildRequires: nspr-devel
BuildRequires: nss-devel
@@ -95,11 +96,35 @@ Source2: %{name}-devel.README
389 Directory Server is an LDAPv3 compliant server. The base package includes
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
Summary: Development libraries for 389 Directory Server
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Requires: nspr-devel
+Requires: nss-devel
+Requires: svrcore-devel
%if %{use_openldap}
Requires: openldap-devel
%else
@@ -229,8 +254,7 @@ exit 0
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
@@ -244,10 +268,20 @@ exit 0
%defattr(-,root,root,-)
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%{_includedir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so
+%{_libdir}/%{pkgname}/libslapd.so
%{_libdir}/pkgconfig/*
+%files libs
+%defattr(-,root,root,-)
+%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
+%dir %{_libdir}/%{pkgname}
+%{_libdir}/%{pkgname}/libslapd.so.*
+
%changelog
+* Mon Feb 28 2011 Rich Megginson <rmeggins(a)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(a)redhat.com> - 1.2.8-0.4.a3
- do not create /var/run/dirsrv - setup will create it instead
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore
commit 5142ec083899b7cf574c2c12a5d8020e26b65c29
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon Feb 28 15:19:40 2011 -0700
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
389-ds-base.spec | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index a2d0bbb..8bfafd4 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -16,7 +16,7 @@
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 1.2.8
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
License: GPLv2 with exceptions
URL: http://port389.org/
Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Provides: fedora-ds-base = %{version}-%{release}
Obsoletes: fedora-ds-base < 1.2.1-1
Obsoletes: %{name}-selinux
Conflicts: selinux-policy-base < 3.9.8
+Requires: %{name}-libs = %{version}-%{release}
BuildRequires: nspr-devel
BuildRequires: nss-devel
@@ -95,11 +96,35 @@ Source2: %{name}-devel.README
389 Directory Server is an LDAPv3 compliant server. The base package includes
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
Summary: Development libraries for 389 Directory Server
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
+Requires: nspr-devel
+Requires: nss-devel
+Requires: svrcore-devel
%if %{use_openldap}
Requires: openldap-devel
%else
@@ -229,8 +254,7 @@ exit 0
%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
%{_bindir}/*
%{_sbindir}/*
-%dir %{_libdir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
@@ -244,10 +268,20 @@ exit 0
%defattr(-,root,root,-)
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%{_includedir}/%{pkgname}
-%{_libdir}/%{pkgname}/*.so
+%{_libdir}/%{pkgname}/libslapd.so
%{_libdir}/pkgconfig/*
+%files libs
+%defattr(-,root,root,-)
+%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
+%dir %{_libdir}/%{pkgname}
+%{_libdir}/%{pkgname}/libslapd.so.*
+
%changelog
+* Mon Feb 28 2011 Rich Megginson <rmeggins(a)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(a)redhat.com> - 1.2.8-0.4.a3
- do not create /var/run/dirsrv - setup will create it instead
- remove the fedora-ds initscript upgrade stuff - we do not support that anymore