[packages/postgrey] - oops! wrong repo, reverted

hawk hawk at pld-linux.org
Fri Jan 25 18:57:11 CET 2019


commit 8793a1e583b6d80138583526b99f00bb6f20438e
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Fri Jan 25 18:56:20 2019 +0100

    - oops! wrong repo, reverted

 postgrey.spec | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/postgrey.spec b/postgrey.spec
index bac60e6..e28e91a 100644
--- a/postgrey.spec
+++ b/postgrey.spec
@@ -3,7 +3,7 @@ Summary:	Postfix Greylisting Policy Server
 Summary(pl.UTF-8):	Serwer do polityki "szarych list" dla Postfiksa
 Name:		postgrey
 Version:	1.37
-Release:	5
+Release:	4
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://postgrey.schweikert.ch/pub/%{name}-%{version}.tar.gz
@@ -13,7 +13,8 @@ Source2:	%{name}.sysconfig
 Source3:	http://www.lipek.pl/postgrey_clients_dump
 # Source3-md5:	155b88f2781b03535bfa2797cda28e52
 Patch0:		%{name}-group.patch
-Patch1:		disable-transaction-logic
+Patch1:		%{name}-postfix_dir.patch
+Patch2:		disable-transaction-logic
 URL:		http://postgrey.schweikert.ch/
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -22,7 +23,7 @@ Requires:	postfix
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir /etc/postfix
+%define		_sysconfdir /etc/mail
 
 %description
 Postgrey is a Postfix policy server implementing greylisting. When a
@@ -67,7 +68,8 @@ lub jeśli chcemy używać gniazd inet (w razie potrzeby zmienić IP):
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,21 +111,6 @@ if [ "$1" = 0 ]; then
 	rm -rf %{_var}/spool/postfix/%{name}
 fi
 
-%triggerun -- %{name} < 1.37-5
-if [ $1 -le 1 ]; then
-	exit 0
-fi
-for f in /etc/mail/postgres_whitelist_{clients,clients.local,recipients}; do
-	f=${f##*/}
-	[ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
-done
-[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
-
-%triggerpostun -- %{name} < 1.37-5
-echo
-echo "Warning! Configuration has been migrated to /etc/postfix."
-echo
-
 %files
 %defattr(644,root,root,755)
 %doc README Changes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postgrey.git/commitdiff/8793a1e583b6d80138583526b99f00bb6f20438e



More information about the pld-cvs-commit mailing list