diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index d763968..8ff1a03 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,13 +10,13 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 3.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz -Source1: pgpool.service -Source2: pgpool.sysconfig +Source1: pgpool.service +Source2: pgpool.sysconfig Source3: pgpool.init BuildRequires: postgresql-devel pam-devel %if %{systemd_enabled} @@ -34,7 +34,8 @@ Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %endif -Obsoletes: postgresql-pgpool +Provides: postgresql-pgpool = 3.4.2 +Obsoletes: postgresql-pgpool <= 3.4.1 %description pgpool-II is a inherited project of pgpool (to classify from @@ -57,17 +58,18 @@ DB nodes to be connected, which was not possible in pgpool-I. %package devel Summary: The development files for pgpool-II Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development headers and libraries for pgpool-II. %package extensions -Summary: Postgersql extensions for pgpool-II -Group: Applications/Databases -Obsoletes: postgresql-pgpool-II-recovery <= 1:3.3.4-1 -Provides: postgresql-pgpool-II-recovery = %{version}-%{release} -Requires: postgresql-server(:MODULE_COMPAT_%{postgresql_major}) +Summary: Postgresql extensions for pgpool-II +Group: Applications/Databases +Obsoletes: postgresql-pgpool-II-recovery <= 3.3.4-1 +Provides: postgresql-pgpool-II-recovery = %{version}-%{release} +Requires: postgresql-server(:MODULE_COMPAT_%{postgresql_major}) +Requires: %{name}%{?_isa} = %{version}-%{release} %description extensions @@ -108,7 +110,7 @@ mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-stream %{buildro %if %{systemd_enabled} install -d %{buildroot}%{_unitdir} -install -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/pgpool.service +install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pgpool.service # ... and make a tmpfiles script to recreate it at reboot. mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} @@ -118,7 +120,7 @@ EOF %else install -d %{buildroot}%{_sysconfdir}/init.d -install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/pgpool +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/pgpool %endif install -d %{buildroot}%{_sysconfdir}/sysconfig @@ -170,7 +172,7 @@ fi %endif %files -%doc README TODO COPYING INSTALL AUTHORS ChangeLog NEWS doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css doc/tutorial-en.html doc/tutorial-ja.html +%doc README TODO COPYING AUTHORS ChangeLog NEWS doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css doc/tutorial-en.html doc/tutorial-ja.html %{_bindir}/pgpool %{_bindir}/pcp_attach_node %{_bindir}/pcp_detach_node @@ -201,7 +203,8 @@ fi %else %{_sysconfdir}/init.d/pgpool %endif -%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf +%dir %{_sysconfdir}/%{short_name} +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf %config(noreplace) %{_sysconfdir}/sysconfig/pgpool %files devel @@ -225,6 +228,10 @@ fi %changelog +* Thu Dec 11 2014 Jozef Mlich - 3.4.0-4 +- incorrect epoch in obsoletes of recovery subpackage +- fixed some rpmlint warnings + * Wed Dec 10 2014 Pavel Raiskup - 3.4.0-3 - lint the spec file, remove RPATH (rhbz#1166534)