Fix offsets in patches

This commit is contained in:
Filip Janus 2022-02-23 10:42:44 +01:00
parent bdc4249e7a
commit 5b845be81f
3 changed files with 11 additions and 13 deletions

View File

@ -1,11 +1,10 @@
Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build
it now, at least till somebody explicitly requests that.
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index 41460a1..cc3dd37 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg
diff -ur postgresql-14.2_original/src/interfaces/ecpg/Makefile postgresql-14.2/src/interfaces/ecpg/Makefile
--- postgresql-14.2_original/src/interfaces/ecpg/Makefile 2022-02-23 09:31:24.000000000 +0100
+++ postgresql-14.2/src/interfaces/ecpg/Makefile 2022-02-23 10:30:19.000000000 +0100
@@ -2,7 +2,7 @@
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
@ -13,4 +12,4 @@ index 41460a1..cc3dd37 100644
+SUBDIRS = include pgtypeslib ecpglib preproc
# Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf
# http://savannah.gnu.org/bugs/?30653
# https://savannah.gnu.org/bugs/?30653

View File

@ -1,10 +1,9 @@
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 32a9fdfb7b..899de131da 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -76,8 +76,6 @@ SHLIB_PREREQS = submake-libpgport
diff -ur postgresql-14.2_original/src/interfaces/libpq/Makefile postgresql-14.2/src/interfaces/libpq/Makefile
--- postgresql-14.2_original/src/interfaces/libpq/Makefile 2022-02-23 09:31:25.000000000 +0100
+++ postgresql-14.2/src/interfaces/libpq/Makefile 2022-02-23 10:18:14.000000000 +0100
@@ -96,8 +96,6 @@
SHLIB_EXPORTS = exports.txt
PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto
-all: all-lib
-

View File

@ -136,7 +136,7 @@ find_lang_bins %name-devel.lst ecpg
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 13.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 27 2021 Filip Januš <fjanus@redhat.com> - 13.3-1
* Tue Jul 27 2021 Filip Januš <fjanus@redhat.com> - 13.3-1
- Update to 13.3
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.1-6