summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tgl@fedoraproject.org>2008-01-07 19:28:34 +0000
committerTom Lane <tgl@fedoraproject.org>2008-01-07 19:28:34 +0000
commit8d5bd11f6b98274c21bf5a194cde080b742e3481 (patch)
treedf07a70f21ee64c065ff61e5ba362863c045df08
parent6bcab53b120eebe369d4b6fc77eaeb1cff0bd8b4 (diff)
downloadpostgresql-setup-8d5bd11f6b98274c21bf5a194cde080b742e3481.tar.gz
postgresql-setup-8d5bd11f6b98274c21bf5a194cde080b742e3481.tar.xz
postgresql-setup-8d5bd11f6b98274c21bf5a194cde080b742e3481.zip
Make initscript and pam config files be installed unconditionallypostgresql-8_2_6-1_fc9
-rwxr-xr-xpostgresql.spec18
1 files changed, 7 insertions, 11 deletions
diff --git a/postgresql.spec b/postgresql.spec
index 724f530..09d5c29 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -503,19 +503,13 @@ cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl
%endif
-if [ -d /etc/rc.d/init.d ]
-then
- install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
- sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
- install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
-fi
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
+install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
%if %pam
-if [ -d /etc/pam.d ]
-then
- install -d $RPM_BUILD_ROOT/etc/pam.d
- install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
-fi
+install -d $RPM_BUILD_ROOT/etc/pam.d
+install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
%endif
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
@@ -827,6 +821,8 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 7 2008 Tom Lane <tgl@redhat.com> 8.2.6-1
- Update to PostgreSQL 8.2.6 to fix CVE-2007-4769, CVE-2007-4772,
CVE-2007-6067, CVE-2007-6600, CVE-2007-6601
+- Make initscript and pam config files be installed unconditionally;
+ seems new buildroots don't necessarily have those directories in place
* Wed Dec 5 2007 Tom Lane <tgl@redhat.com> 8.2.5-2
- Rebuild for new openssl