From 5a6f471154bb6ae8f623fedb914a3651cfce07d4 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 3 Dec 2018 17:33:44 +0000 Subject: [PATCH] - doh, merged too much --- postgresql.logrotate | 7 ------- postgresql.spec | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 postgresql.logrotate diff --git a/postgresql.logrotate b/postgresql.logrotate deleted file mode 100644 index 1001b95..0000000 --- a/postgresql.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/postgresql/*.log -{ - olddir /var/log/archive/postgresql - notifempty - missingok - copytruncate -} diff --git a/postgresql.spec b/postgresql.spec index a0596b0..960d750 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -38,7 +38,6 @@ Source1: postgresql.init Source2: pgsql-Database-HOWTO-html.tar.gz # Source2-md5: 5b656ddf1db41965761f85204a14398e Source3: postgresql.sysconfig -Source4: postgresql.logrotate Patch0: postgresql-conf.patch Patch1: postgresql-absolute_dbpaths.patch Patch2: postgresql-ecpg-includedir.patch @@ -551,7 +550,7 @@ done %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{logrotate.d,rc.d/init.d,sysconfig}} \ +install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \ $RPM_BUILD_ROOT/var/{lib/postgresql/%{pgsqlversion},log/{archive,}/postgresql,run/postgresql} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ $RPM_BUILD_ROOT%{_mandir} @@ -575,7 +574,6 @@ done sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g; s,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql-%{pgsqlversion} sed -e 's,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE3} >$RPM_BUILD_ROOT/etc/sysconfig/postgresql-%{pgsqlversion} -cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/postgresql install -d howto tar zxf %{SOURCE2} -C howto -- 2.44.0