Request 520 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 520 (accepted)

New upstream release 1.2.11.30

Created by ajaissle over 9 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit 389-ds-base

Submit package home:ajaissle...b:Development / 389-ds-base to package Kolab:Development / 389-ds-base

389-ds-base.changes Changed

389-ds-base.spec Changed

@@ -24,7 +24,7 @@
 
 Name:           389-ds-base
 Summary:        389 Directory Server
-Version:        1.2.11.29
+Version:        1.2.11.30
 Release:        0
 
 Group:          Productivity/Networking/LDAP/Servers
@@ -32,7 +32,7 @@
 Url:            http://port389.org/
 #DL-URL:        http://port389.org/wiki/Source
 #Git-Clone:     git://git.fedorahosted.org/389/ds
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://port389.org/sources/%{name}-%{version}.tar.bz2
 # Patch1: Make init scripts LSB conform
 Patch1:         389-ds-base-1.2.11.15_dirsrv_init.patch
 # Patch2: Fix Kolab bug 2229
@@ -66,7 +66,6 @@
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-Requires:       389-admin
 Requires:       perl-Mozilla-LDAP
 
 %if %{?with_systemd} == 0
@@ -83,11 +82,10 @@
 Requires(post): fillup
 %endif
 
-%if 0%{?suse_version}
-Suggests:       389-ds-console
-%endif
+Obsoletes:      389-ds < %{version}
+Provides:       389-ds = %{version}
 
-Provides:       389-ds
+Recommends:     389-admin
 
 %description
 389 Directory Server is a full-featured LDAPv3 compliant server. In
@@ -116,7 +114,7 @@
 
 %prep
 %setup -q
-%patch -P 1 -p 0
+%patch1 -p 0
 
 %build
 # openldap has no pkgconfig file; because of that, 389-ds will prefer
@@ -139,7 +137,7 @@
 
 %if %{?with_systemd} == 1
 # systemd directory used for instances created with setup
-mkdir -p %{buildroot}/%{_sysconfdir}/systemd/system/dirsrv.target.wants
+%{__install} -d %{buildroot}%{_unitdir}/dirsrv.target.wants
 %endif
 
 %if 0%{?suse_version}
@@ -202,7 +200,6 @@
 %endif
 %if %{?with_systemd} == 1
 %{_unitdir}/dirsrv*
-%dir %{_sysconfdir}/systemd/system/dirsrv.target.wants
 %else
 %{_initddir}/*
 %endif