SPECS: perdition.spec - up to 1.17; use %service - openldap-schema...

[zbyniu]

Author: zbyniu                       Date: Thu Feb 22 23:04:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.17; use %service
- openldap-schema-perdition subpackage

---- Files affected:
SPECS:
   perdition.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/perdition.spec
diff -u SPECS/perdition.spec:1.41 SPECS/perdition.spec:1.42
--- SPECS/perdition.spec:1.41	Tue Feb 13 08:16:52 2007
+++ SPECS/perdition.spec	Fri Feb 23 00:04:31 2007
@@ -2,12 +2,12 @@
 Summary:	Mail Retrieval Proxy
 Summary(pl.UTF-8):	Proxy do ściągania poczty
 Name:		perdition
-Version:	1.15
+Version:	1.17
 Release:	0.8
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.vergenet.net/linux/perdition/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	7c3aaf30198cf73191a984a76637a940
+# Source0-md5:	6cef90e55bde9eb2d0a17acccb3516f3
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-nolibs.patch
@@ -28,6 +28,7 @@
 BuildRequires:	pam-devel
 BuildRequires:	popt-devel
 BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.304
 BuildRequires:	tetex-dvips
 BuildRequires:	tetex-fonts-adobe
 BuildRequires:	tetex-format-latex
@@ -39,13 +40,14 @@
 BuildRequires:	vanessa_socket-devel
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-gdbm = %{version}-%{release}
 Requires:	rc-scripts
 Requires:	vanessa_adt >= 0.0.4
 Requires:	vanessa_logger >= 0.0.6
 Requires:	vanessa_socket >= 0.0.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		schemadir	/usr/share/openldap/schema
+
 %description
 Perdition allows users to connect to a content-free POP3 or IMAP4
 server that will redirect them to their real POP3 or IMAP4 server.
@@ -182,10 +184,22 @@
 Ten pakiet zawiera statyczną wersję biblioteki jain, która może być
 (rzadko jednak) przydatna przy tworzeniu bibliotek perditiondb.
 
+%package -n openldap-schema-perdition
+Summary:	Perdition LDAP schema
+Summary(pl.UTF-8):	Schemat LDAP dla perdition
+Group:		Networking/Daemons
+Requires:	openldap-servers
+
+%description -n openldap-schema-perdition
+This package contains LDAP schema for use with perdition.
+
+%description -n openldap-schema-perdition -l pl.UTF-8
+Ten pakiet zawiera schemat LDAP do używania z perdition.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p0
 
 %build
@@ -195,7 +209,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-ldap-schema-directory=/etc/openldap/schema
+	--with-ldap-schema-directory=%{schemadir}
 
 %{__make}
 
@@ -219,18 +233,14 @@
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add perdition
+/sbin/chkconfig --add %{name}
 %{__make} -q -C /etc/perdition
-if [ -f /var/lock/subsys/perdition.imap -o -f /var/lock/subsys/perdition.pop ]; then
-	/etc/rc.d/init.d/perdition restart
-else
-	echo "Run \"/etc/rc.d/init.d/perdition start\" to start perdition daemon."
-fi
+%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/chkconfig --del perdition
-	/etc/rc.d/init.d/perdition stop
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
 fi
 
 %postun -p /sbin/ldconfig
@@ -259,7 +269,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog NEWS CODING_LOCATIONS TODO
-%attr(755,root,root) %{_sbindir}/perdition*
+%attr(755,root,root) %{_sbindir}/perdition
+%attr(755,root,root) %{_sbindir}/perdition.*
 %attr(755,root,root) %{_libdir}/libjain.so.*.*
 %attr(755,root,root) %{_libdir}/libperditiondb_posix_regex.so.*.*
 
@@ -295,7 +306,6 @@
 %attr(755,root,root) %{_sbindir}/perditiondb_ldap_makedb
 %attr(755,root,root) %{_libdir}/libperditiondb_ldap.so.*.*
 %{_mandir}/man8/perditiondb_ldap_makedb.8*
-/etc/openldap/schema/perdition.schema
 
 %files mysql
 %defattr(644,root,root,755)
@@ -330,12 +340,20 @@
 %defattr(644,root,root,755)
 %{_libdir}/libjain.a
 
+%files -n openldap-schema-perdition
+%defattr(644,root,root,755)
+%{schemadir}/perdition.schema
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2007/02/22 23:04:31  zbyniu
+- up to 1.17; use %service
+- openldap-schema-perdition subpackage
+
 Revision 1.41  2007/02/13 07:16:52  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/perdition.spec?r1=1.41&r2=1.42&f=u