diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index e81a51a..daa3687 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -8,9 +8,10 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.27 -Release: 0.3rc7%{?dist} +Release: 0.4rc7%{?dist} License: BSD with advertising -Group: System Environment/Libraries +URL: https://www.cyrusimap.org/sasl/ + # Source0 originally comes from https://www.cyrusimap.org/releases/; # make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and builds a # new tarball. @@ -22,7 +23,7 @@ Source10: make-no-dlcompatorsrp-tarball.sh # From upstream git, required for reconfigure after applying patches to configure.ac # https://raw.githubusercontent.com/cyrusimap/cyrus-sasl/master/autogen.sh Source11: autogen.sh -URL: https://www.cyrusimap.org/sasl/ + Requires: %{name}-lib%{?_isa} = %{version}-%{release} Patch11: cyrus-sasl-2.1.25-no_rpath.patch Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch @@ -34,7 +35,6 @@ Patch49: cyrus-sasl-2.1.26-md5global.patch # https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480 Patch50: cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig BuildRequires: mariadb-connector-c-devel, libpq-devel, zlib-devel @@ -43,7 +43,6 @@ BuildRequires: libdb-devel BuildRequires: openldap-devel %endif %{?systemd_requires} -Requires(post): chkconfig Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel Requires: /sbin/nologin @@ -58,7 +57,6 @@ SASL is the Simple Authentication and Security Layer, a method for adding authentication support to connection-based protocols. %package lib -Group: System Environment/Libraries Summary: Shared libraries needed by applications which use Cyrus SASL %description lib @@ -69,7 +67,6 @@ applications which use the Cyrus SASL library. Requires: %{name}-lib%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig -Group: Development/Libraries Summary: Files needed for developing applications with Cyrus SASL %description devel @@ -78,7 +75,6 @@ compiling applications which use the Cyrus SASL library. %package gssapi Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: GSSAPI authentication support for Cyrus SASL %description gssapi @@ -88,7 +84,6 @@ authentication. %package plain Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: PLAIN and LOGIN authentication support for Cyrus SASL %description plain @@ -97,7 +92,6 @@ PLAIN and LOGIN authentication schemes. %package md5 Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL %description md5 @@ -106,7 +100,6 @@ CRAM-MD5 and DIGEST-MD5 authentication schemes. %package ntlm Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: NTLM authentication support for Cyrus SASL %description ntlm @@ -116,7 +109,6 @@ the NTLM authentication scheme. # This would more appropriately be named cyrus-sasl-auxprop-sql. %package sql Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: SQL auxprop support for Cyrus SASL %description sql @@ -127,7 +119,6 @@ using a RDBMS for storing shared secrets. # This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing. %package ldap Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: LDAP auxprop support for Cyrus SASL %description ldap @@ -137,7 +128,6 @@ a directory server, accessed using LDAP, for storing shared secrets. %package scram Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: SCRAM auxprop support for Cyrus SASL %description scram @@ -146,7 +136,6 @@ the SCRAM authentication scheme. %package gs2 Requires: %{name}-lib%{?_isa} = %{version}-%{release} -Group: System Environment/Libraries Summary: GS2 support for Cyrus SASL %description gs2 @@ -208,12 +197,6 @@ if test x"$LIB_DIR" != "x-L%{_libdir}"; then LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS fi -# Patch config.sub to support ppc64p7 subarch (Fedora specific) -# This is similar to what the config.sub from automake has -for i in `find . -name config.sub`; do - perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i -done - CFLAGS="$RPM_OPT_FLAGS $CFLAGS $CPPFLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"; export CFLAGS echo "$CFLAGS" @@ -281,9 +264,8 @@ install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/ install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8 install -m644 -p saslauthd/testsaslauthd.8 $RPM_BUILD_ROOT%{_mandir}/man8/testsaslauthd.8 -# Install the init script for saslauthd and the init script's config file. -install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig -install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} +# Install the systemd unit file for saslauthd and the config file. +install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/etc/sysconfig install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd @@ -316,11 +298,6 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %postun %systemd_postun_with_restart saslauthd.service -%triggerun -n cyrus-sasl -- cyrus-sasl < 2.1.23-32 -/usr/bin/systemd-sysv-convert --save saslauthd >/dev/null 2>&1 || : -/sbin/chkconfig --del saslauthd >/dev/null 2>&1 || : -/bin/systemctl try-restart saslauthd.service >/dev/null 2>&1 || : - %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -383,6 +360,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %{_sbindir}/sasl2-shared-mechlist %changelog +* Sun Oct 14 2018 Peter Robinson 2.1.27-0.4rc7 +- Clean up remanents of sys-v, spec cleanups + * Thu Jul 12 2018 Fedora Release Engineering - 2.1.27-0.3rc7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild