Merge remote-tracking branch 'origin/debian'

[hcoop/debian/courier-authlib.git] / courier-authlib.lpspec

diff --git a/courier-authlib.lpspec b/courier-authlib.lpspec
index 5c4d63b..f140a8f 100644 (file)
--- a/courier-authlib.lpspec
+++ b/courier-authlib.lpspec
@@ -1,13 +1,12 @@
-# $Id: courier-authlib.lpspec.in,v 1.10 2007/07/21 20:05:54 mrsam Exp $

 #
 #

-# Copyright 2005 Double Precision, Inc.  See COPYING for
+# Copyright 2005-2010 Double Precision, Inc.  See COPYING for

 # distribution information.
 
 Name:           courier-authlib
 # distribution information.
 
 Name:           courier-authlib

-Version:        0.60.2
+Version:        0.66.4

 Release:        1
 
 Release:        1
 

-License:        GPL
+License:        GPLv3

 URL:            http://www.courier-mta.org
 
 ################################################################################
 URL:            http://www.courier-mta.org
 
 ################################################################################


@@ -18,12 +17,13 @@ Source:         http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
 
 BuildRequires:      libtool
 BuildRequires:      openldap-devel
 
 BuildRequires:      libtool
 BuildRequires:      openldap-devel

-BuildRequires:      mysql-devel zlib-devel
+BuildRequires:      mysql-devel zlib-devel sqlite-devel

 BuildRequires:      postgresql-devel
 BuildRequires:      gdbm-devel
 BuildRequires:      pam-devel
 BuildRequires:      expect
 BuildRequires:      gcc-c++
 BuildRequires:      postgresql-devel
 BuildRequires:      gdbm-devel
 BuildRequires:      pam-devel
 BuildRequires:      expect
 BuildRequires:      gcc-c++

+BuildRequires:      courier-unicode-devel

 
 BuildRequires:      /usr/include/ltdl.h
 
 
 BuildRequires:      /usr/include/ltdl.h
 


@@ -33,7 +33,7 @@ BuildRequires:      /usr/include/ltdl.h
 %package
 Summary:        Courier authentication library
 Group:          System Environment/Daemons
 %package
 Summary:        Courier authentication library
 Group:          System Environment/Daemons

-Requires:       /sbin/chkconfig
+Requires:       /bin/systemctl

 
 The Courier authentication library provides authentication services for
 other Courier applications.
 
 The Courier authentication library provides authentication services for
 other Courier applications.


@@ -79,9 +79,18 @@ Requires:   courier-authlib = %{__version}-%{__release}
 This package installs MySQL support for the Courier authentication library.
 Install this package in order to be able to authenticate using MySQL.
 
 This package installs MySQL support for the Courier authentication library.
 Install this package in order to be able to authenticate using MySQL.
 

+%package sqlite
+Summary:    SQLite support for the Courier authentication library
+Group:      System Environment/Daemons
+Requires:   courier-authlib = %{__version}-%{__release}
+
+This package installs SQLite support for the Courier authentication library.
+Install this package in order to be able to authenticate using an SQLite-based
+database file.
+

 ################################################################################
 %package pgsql
 ################################################################################
 %package pgsql

-Summary:    MySQL support for the Courier authentication library
+Summary:    PostgreSQL support for the Courier authentication library

 Group:      System Environment/Daemons
 Requires:   courier-authlib = %{__version}-%{__release}
 
 Group:      System Environment/Daemons
 Requires:   courier-authlib = %{__version}-%{__release}
 


@@ -91,7 +100,7 @@ Install this package in order to be able to authenticate using PostgreSQL.
 
 %begin
 %setup
 
 %begin
 %setup

-%configure --with-redhat
+%configure --with-redhat -C

 %begin build
 %{__make} -s %{_smp_mflags}
 
 %begin build
 %{__make} -s %{_smp_mflags}
 


@@ -100,12 +109,14 @@ rm -rf $__installdir
 MAKEFLAGS= %{__make} -j 1 install DESTDIR=$__installdir
 %{__rm} -f $__installdir%{_libdir}/courier-authlib/*.a
 %{__install} -m 555 sysconftool $__installdir%{_libexecdir}/courier-authlib
 MAKEFLAGS= %{__make} -j 1 install DESTDIR=$__installdir
 %{__rm} -f $__installdir%{_libdir}/courier-authlib/*.a
 %{__install} -m 555 sysconftool $__installdir%{_libexecdir}/courier-authlib

-%{__install} -m 555 authmigrate $__installdir%{_libexecdir}/courier-authlib

 
 ./courierauthconfig --configfiles >configtmp
 
 ./courierauthconfig --configfiles >configtmp

-. configtmp
+. ./configtmp

 
 

-./authmksock $__installdir%{_localstatedir}/spool/authdaemon/socket || exit 1
+d=`pwd`
+cd $RPM_BUILD_ROOT%{_localstatedir}/spool/authdaemon || exit 1
+$d/authmksock ./socket || exit 1
+cd $d || exit 1

 touch $__installdir%{_localstatedir}/spool/authdaemon/pid.lock || exit 1
 touch $__installdir%{_localstatedir}/spool/authdaemon/pid || exit 1
 %{__chmod} 777 $__installdir%{_localstatedir}/spool/authdaemon/socket || exit 1
 touch $__installdir%{_localstatedir}/spool/authdaemon/pid.lock || exit 1
 touch $__installdir%{_localstatedir}/spool/authdaemon/pid || exit 1
 %{__chmod} 777 $__installdir%{_localstatedir}/spool/authdaemon/socket || exit 1


@@ -119,6 +130,7 @@ cat >configfiles.base <<EOF
 EOF
 
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.mysql
 EOF
 
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.mysql

+echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.sqlite

 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.ldap
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.pgsql
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.userdb
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.ldap
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.pgsql
 echo "%defattr(-,$mailuser,$mailgroup,-)" >configfiles.userdb


@@ -147,6 +159,9 @@ do
        libauthmysql*)
                echo "%{_libdir}/courier-authlib/$fn" >>configfiles.mysql
                ;;
        libauthmysql*)
                echo "%{_libdir}/courier-authlib/$fn" >>configfiles.mysql
                ;;

+       libauthsqlite*)
+               echo "%{_libdir}/courier-authlib/$fn" >>configfiles.sqlite
+               ;;

        libauthpgsql*)
                echo "%{_libdir}/courier-authlib/$fn" >>configfiles.pgsql
                ;;
        libauthpgsql*)
                echo "%{_libdir}/courier-authlib/$fn" >>configfiles.pgsql
                ;;


@@ -161,16 +176,23 @@ do
                ;;
        esac
 done
                ;;
        esac
 done

-%{__mkdir_p} $__installdir%{_sysconfdir}/rc.d/init.d
-%{__install} -m 555 courier-authlib.sysvinit \
-        $__installdir%{_sysconfdir}/rc.d/init.d/courier-authlib
+%{__mkdir_p} $__installdir%{_datadir}
+%{__install} -m 555 courier-authlib.sysvinit $__installdir%{_datadir}
+
+%{__mkdir_p} $__installdir/lib/systemd/system
+%{__install} -m 644 courier-authlib.service $__installdir/lib/systemd/system

 
 %post
 
 %post

-%{_libexecdir}/courier-authlib/authmigrate >/dev/null

 %{_libexecdir}/courier-authlib/sysconftool %{_sysconfdir}/authlib/*.dist >/dev/null
 
 %{_libexecdir}/courier-authlib/sysconftool %{_sysconfdir}/authlib/*.dist >/dev/null
 

-/sbin/chkconfig --del courier-authlib
-/sbin/chkconfig --add courier-authlib
+if test -f /etc/rc.d/init.d/courier-authlib
+then
+        /sbin/chkconfig --del courier-authlib
+        /bin/systemctl stop courier-authlib.service || :
+fi
+
+/bin/systemctl daemon-reload || :
+/bin/systemctl enable courier-authlib.service &> /dev/null || :

 
 %preun
 if test -x %{_sbindir}/authdaemond
 
 %preun
 if test -x %{_sbindir}/authdaemond


@@ -180,14 +202,19 @@ fi
 
 if test "$1" = "0"
 then
 
 if test "$1" = "0"
 then

-       /sbin/chkconfig --del courier-authlib
+        /bin/systemctl stop courier-authlib.service
+        /bin/systemctl disable courier-authlib.service

 fi
 
 fi
 

+%postun
+/bin/systemctl daemon-reload || :
+

 %files -f configfiles.base
 %defattr(-,root,root,-)
 %doc README README*html README.authmysql.myownquery README.ldap
 %files -f configfiles.base
 %defattr(-,root,root,-)
 %doc README README*html README.authmysql.myownquery README.ldap

-%doc NEWS COPYING* AUTHORS ChangeLog authldap.schema
-/etc/rc.d/init.d/*
+%doc NEWS COPYING* AUTHORS ChangeLog
+/lib/systemd/system/*
+%attr(755, bin, bin) %{_datadir}/courier-authlib.sysvinit

 %ghost %attr(600, root, root) %{_localstatedir}/spool/authdaemon/pid.lock
 %ghost %attr(644, root, root) %{_localstatedir}/spool/authdaemon/pid
 %ghost %attr(-, root, root) %{_localstatedir}/spool/authdaemon/socket
 %ghost %attr(600, root, root) %{_localstatedir}/spool/authdaemon/pid.lock
 %ghost %attr(644, root, root) %{_localstatedir}/spool/authdaemon/pid
 %ghost %attr(-, root, root) %{_localstatedir}/spool/authdaemon/socket


@@ -205,10 +232,12 @@ fi
 
 %files -f configfiles.ldap ldap
 %defattr(-,root,root,-)
 
 %files -f configfiles.ldap ldap
 %defattr(-,root,root,-)

-%doc authldap.schema
+%doc authldap.schema authldap.ldif

 
 %files -f configfiles.mysql mysql
 
 
 %files -f configfiles.mysql mysql
 

+%files -f configfiles.sqlite sqlite
+

 %files -f configfiles.pgsql pgsql
 
 %changelog
 %files -f configfiles.pgsql pgsql
 
 %changelog