From: Marcin Krol Date: Mon, 3 Dec 2018 17:32:44 +0000 (+0000) Subject: - doh, merged too much X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=6b1bcb3927623940e261189860a8c168bd1770d9;p=packages%2Fpostgresql.git - doh, merged too much --- 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 30cc1a8..b98779a 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 @@ -550,7 +549,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} @@ -574,7 +573,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