rpm/postgresql12
SHA256
1
0
Fork 0
forked from pool/postgresql12
Code Pull Requests Activity

Accepting request 773379 from home:StefanBruens:branches:openSUSE:Factory:Staging:I

Browse Source 
- Avoid the dependency from the devel package to the main package.
  devel packages are exclusive, thus ecpg does not require
  update-alternatives.

OBS-URL: https://build.opensuse.org/request/show/773379
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=6
This commit is contained in:
Reinhard Max 2020-02-11 09:33:54 +00:00 committed by Git OBS Bridge
parent 2835578351
commit ca5b2a1156
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
postgresql12.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 11 04:15:40 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Avoid the dependency from the devel package to the main package.
devel packages are exclusive, thus ecpg does not require
update-alternatives.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 6 17:13:41 UTC 2020 - Reinhard Max <max@suse.com> Thu Feb 6 17:13:41 UTC 2020 - Reinhard Max <max@suse.com>

18
postgresql12.spec
View File

@ -199,8 +199,6 @@ Group: Development/Libraries/C and C++
Provides: postgresql-devel-implementation = %version-%release Provides: postgresql-devel-implementation = %version-%release
Requires: %libecpg >= %version Requires: %libecpg >= %version
Requires: %libpq >= %version Requires: %libpq >= %version
Requires(post): postgresql-noarch >= %pgmajor
Requires(postun): postgresql-noarch >= %pgmajor
# Installation of postgresql??-devel is exclusive # Installation of postgresql??-devel is exclusive
Provides: postgresql-devel-exclusive = %pgmajor Provides: postgresql-devel-exclusive = %pgmajor
Conflicts: postgresql-devel-exclusive < %pgmajor Conflicts: postgresql-devel-exclusive < %pgmajor
@ -614,7 +612,9 @@ done
popd popd
mkdir -p %buildroot%pgmandir/man1 mkdir -p %buildroot%pgmandir/man1
cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor
genlists devel ecpg # No update-alternatives, devel-packages are exclusive
ln -s %pgbindir/ecpg %buildroot%_bindir/ecpg
%find_lang ecpg-%{pgmajor} devel.files
# Build up the file lists for the libpq and libecpg packages # Build up the file lists for the libpq and libecpg packages
cat > libpq.files <<EOF cat > libpq.files <<EOF
@ -715,15 +715,6 @@ fi
/usr/share/postgresql/install-alternatives %priority /usr/share/postgresql/install-alternatives %priority
%endif %endif
%if %builddevel
%post -n %pgname-devel
/usr/share/postgresql/install-alternatives %priority
%postun -n %pgname-devel
/usr/share/postgresql/install-alternatives %priority
%endif
%if %buildlibs %if %buildlibs
%post -n %libpq -p /sbin/ldconfig %post -n %libpq -p /sbin/ldconfig
@ -838,9 +829,12 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%dir %pgbasedir %dir %pgbasedir
%dir %pgbindir %dir %pgbindir
%_bindir/ecpg
%_libdir/pkgconfig/* %_libdir/pkgconfig/*
%_libdir/lib*.so %_libdir/lib*.so
%pgbindir/ecpg
%pgincludedir %pgincludedir
%doc %pgmandir/man1/ecpg.1*
%endif %endif