upgrade: optimise build for --define 'upgrade 0'
Version: 2.4.0-1
This commit is contained in:
parent
d5a07cd02e
commit
6a7bf86376
11
postgis.spec
11
postgis.spec
|
@ -19,9 +19,7 @@ License: GPLv2+
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Source0: http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
|
Source0: http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
|
||||||
Source2: http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
|
Source2: http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
|
||||||
%if %upgrade
|
|
||||||
Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.tar.gz
|
Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.tar.gz
|
||||||
%endif
|
|
||||||
Source4: filter-requires-perl-Pg.sh
|
Source4: filter-requires-perl-Pg.sh
|
||||||
Patch1: postgis-configureac21.patch
|
Patch1: postgis-configureac21.patch
|
||||||
Patch2: postgis-2.4.0-upgrade-2.3.3.patch
|
Patch2: postgis-2.4.0-upgrade-2.3.3.patch
|
||||||
|
@ -114,6 +112,8 @@ necessary for correct dump of schema from previous version of PostgreSQL.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version} -a 3
|
%setup -q -n %{name}-%{version} -a 3
|
||||||
|
|
||||||
|
%if %upgrade
|
||||||
(
|
(
|
||||||
cd %{name}-%{prevversion}
|
cd %{name}-%{prevversion}
|
||||||
# Remove once we move to prevversion==2.4 (2.4 build works fine).
|
# Remove once we move to prevversion==2.4 (2.4 build works fine).
|
||||||
|
@ -121,6 +121,7 @@ cd %{name}-%{prevversion}
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
)
|
)
|
||||||
|
%endif
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
cp -p %{SOURCE2} .
|
cp -p %{SOURCE2} .
|
||||||
|
|
||||||
|
@ -145,6 +146,7 @@ popd
|
||||||
make %{?_smp_mflags} -C utils
|
make %{?_smp_mflags} -C utils
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %upgrade
|
||||||
(
|
(
|
||||||
# TODO: report that out-of-tree (VPATH) build is broken
|
# TODO: report that out-of-tree (VPATH) build is broken
|
||||||
cd %{name}-%{prevversion}
|
cd %{name}-%{prevversion}
|
||||||
|
@ -162,6 +164,7 @@ done
|
||||||
%configure %configure_opts --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config
|
%configure %configure_opts --with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
)
|
)
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
@ -172,6 +175,7 @@ make %{?_smp_mflags} -C extensions install DESTDIR=%{buildroot}
|
||||||
# hack: this requires postgis-%version-install-desktop.patch
|
# hack: this requires postgis-%version-install-desktop.patch
|
||||||
make -C loader install-rpm-desktop DESTDIR=%{buildroot} datadir=%{_datadir}
|
make -C loader install-rpm-desktop DESTDIR=%{buildroot} datadir=%{_datadir}
|
||||||
|
|
||||||
|
%if %upgrade
|
||||||
cd %{name}-%{prevversion}
|
cd %{name}-%{prevversion}
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
cd ..
|
cd ..
|
||||||
|
@ -180,7 +184,7 @@ cd ..
|
||||||
for so in %so_files; do
|
for so in %so_files; do
|
||||||
%{__install} -m 644 compat-build/$so-%{prevmajorversion}.so %{buildroot}/%{_libdir}/pgsql
|
%{__install} -m 644 compat-build/$so-%{prevmajorversion}.so %{buildroot}/%{_libdir}/pgsql
|
||||||
done
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
rm -f %{buildroot}%{_datadir}/*.sql
|
rm -f %{buildroot}%{_datadir}/*.sql
|
||||||
|
|
||||||
|
@ -293,6 +297,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/shp2pgsql-gui.deskto
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
|
* Tue Oct 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
|
||||||
- install desktop files into /usr/share/applications
|
- install desktop files into /usr/share/applications
|
||||||
|
- optimize build without %%upgrade
|
||||||
|
|
||||||
* Tue Oct 10 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
|
* Tue Oct 10 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
|
||||||
- provide postgis-upgrade package (rhbz#1475177)
|
- provide postgis-upgrade package (rhbz#1475177)
|
||||||
|
|
Loading…
Reference in New Issue