From 28814d63154766dd711e157fbbd501f8fcce100a Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Sep 25 2020 14:38:42 +0000
Subject: Update postfixadmin to rev 30 via SR 832594
https://build.opensuse.org/request/show/832594
by user cboltz + dimstar_suse
- Add Recommends for postfixadmin-apache
- Split out a postfixadmin-apache package
- Update to version 3.2.4
* Upgrade Smarty (v3.1.35)
* Fix issues with quota (cli mailbox creation)
* Improve database compatability (row->r).
* Persistent MySQLi connections: Missing SSL at reconnect
* Fix SQLite paging issues, see #161 and #87
* Fix postfixadmin-cli, see #296 (forwarded request 830445 from gladiac)
---
diff --git a/.files b/.files
index 60c3e06..118530f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 2b6e634..e70ab99 100644
--- a/.rev
+++ b/.rev
@@ -372,4 +372,20 @@ SVN changes since 2.3.4 release (postfixadmin-2.3 branch)
ERROR: manifest length read was "41556" should be "655360"</comment>
<requestid>698182</requestid>
</revision>
+ <revision rev="30" vrev="1">
+ <srcmd5>d656353078d0ba5291a7ed046dfb0b02</srcmd5>
+ <version>3.2.4</version>
+ <time>1601044250</time>
+ <user>dimstar_suse</user>
+ <comment>- Add Recommends for postfixadmin-apache
+- Split out a postfixadmin-apache package
+- Update to version 3.2.4
+ * Upgrade Smarty (v3.1.35)
+ * Fix issues with quota (cli mailbox creation)
+ * Improve database compatability (row-&gt;r).
+ * Persistent MySQLi connections: Missing SSL at reconnect
+ * Fix SQLite paging issues, see #161 and #87
+ * Fix postfixadmin-cli, see #296 (forwarded request 830445 from gladiac)</comment>
+ <requestid>832594</requestid>
+ </revision>
</revisionlist>
diff --git a/postfixadmin-3.2.4.tar.gz b/postfixadmin-3.2.4.tar.gz
new file mode 120000
index 0000000..bab242f
--- /dev/null
+++ b/postfixadmin-3.2.4.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeifeucpsxn4k2alz4slut7hluzk5gqlcacvoqdkyo6v5m2yxdn34le
\ No newline at end of file
diff --git a/postfixadmin-3.2.tar.gz b/postfixadmin-3.2.tar.gz
deleted file mode 120000
index cadacb1..0000000
--- a/postfixadmin-3.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidp5apynszned5rxdsjpqnfsspcz6jmal7webxew7rvrh3h3puznm
\ No newline at end of file
diff --git a/postfixadmin.changes b/postfixadmin.changes
index cf88eef..d48f833 100644
--- a/postfixadmin.changes
+++ b/postfixadmin.changes
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Sat Aug 29 08:51:36 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
+
+- Add Recommends for postfixadmin-apache
+
+-------------------------------------------------------------------
+Tue Aug 25 10:04:30 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
+
+- Split out a postfixadmin-apache package
+- Update to version 3.2.4
+ * Upgrade Smarty (v3.1.35)
+ * Fix issues with quota (cli mailbox creation)
+ * Improve database compatability (row->r).
+ * Persistent MySQLi connections: Missing SSL at reconnect
+ * Fix SQLite paging issues, see #161 and #87
+ * Fix postfixadmin-cli, see #296
+
+-------------------------------------------------------------------
Fri Apr 26 11:12:45 UTC 2019 - Christian Boltz <suse-beta@cboltz.de>
- "downgrade" php-imap to Recommends because latest PHP packages no longer
diff --git a/postfixadmin.spec b/postfixadmin.spec
index c11b7fc..a06bcbc 100644
--- a/postfixadmin.spec
+++ b/postfixadmin.spec
@@ -1,7 +1,7 @@
#
# spec file for package postfixadmin
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2007-2019 Christian Boltz
#
# All modifications and additions to the file contributed by third parties
@@ -18,10 +18,10 @@
Name: postfixadmin
-Version: 3.2
+Version: 3.2.4
Release: 0
-Url: http://postfixadmin.sourceforge.net/
-Source0: http://sourceforge.net/projects/postfixadmin/files/postfixadmin/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL: http://postfixadmin.sourceforge.net/
+Source0: https://github.com/postfixadmin/postfixadmin/archive/%{name}-%{version}.tar.gz
Source1: config.local.php
Source2: apache-postfixadmin.conf
@@ -38,11 +38,13 @@ Recommends: php-mysql
%endif
Requires: /usr/sbin/sendmail
-Recommends: php-imap
Requires: php-mbstring
Requires: php-phar
Requires: php-spl
+Recommends: php-imap
+Recommends: postfixadmin-apache
+
# test/*, xmlrpc.php, squirrelmail plugin
# big dependency, not needed by all users - therefore no hard Requirement
%if 0%{?suse_version}
@@ -113,8 +115,19 @@ Postfix Admin supports:
- Fetchmail integration
- Packaged with over 25 languages.
+%package apache
+Requires: apache2
+Summary: Postfixadmin - Apache configuration
+Group: Productivity/Networking/Web/Utilities
+
+%description apache
+PostfixAdmin is a PHP based application that handles Postfix Style Virtual
+Domains and Users that are stored in MySQL or PostgreSQL.
+
+This package holds the apache configuration.
+
%prep
-%setup -q
+%autosetup -p1 -n %{name}-%{name}-%{version}
%build
@@ -189,9 +202,6 @@ fi
%config %dir %{_sysconfdir}/%{name}
%attr(640,root,www) %config %{_sysconfdir}/%{name}/config.inc.php
%attr(640,root,www) %config(noreplace) %{_sysconfdir}/%{name}/config.local.php
-%config %dir %{_sysconfdir}/apache2
-%config %dir %{_sysconfdir}/apache2/conf.d
-%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf
%doc DOCUMENTS/* *.TXT README.md VIRTUAL_VACATION
/usr/bin/postfixadmin-cli
/usr/share/%{name}/
@@ -204,4 +214,9 @@ fi
%attr(1770,root,vacation) %dir %{_localstatedir}/spool/vacation
%{_localstatedir}/spool/vacation/vacation.pl
+%files apache
+%config %dir %{_sysconfdir}/apache2
+%config %dir %{_sysconfdir}/apache2/conf.d
+%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf
+
%changelog