- doh, merged too much

diff --git a/postgresql.logrotate b/postgresql.logrotate
deleted file mode 100644 (file)
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 78fab92151b02858ee88868adb82284bf18f6afd..b8afb1b8c0c5d61d072e69b22be2801a7d2544d6 100644 (file)
--- 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
@@ -549,7 +548,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}
@@ -573,7 +572,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