public inbox for [email protected]  

help / color / mirror / Atom feed

From: Victor Yegorov <[email protected]>
To: Devrim Gündüz <[email protected]>
Cc: Christoph Berg <[email protected]>
Cc: [email protected]
Subject: Re: Skytools for 10 — RPM missing
Date: Mon, 18 Dec 2017 21:17:28 +0200
Message-ID: <CAGnEboibud6TtmnaJCmK9SNCpcHOKyq4+mHYMEb2EDVP2yofCg@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>
References: <CAGnEboiSJKXoRVFz3G+SqYoX1c2wG11C08n46sK_21Q5Koq+5w@mail.gmail.com>
	<[email protected]>
	<[email protected]>
	<CAGnEbogK2EsxgsUVbHic6+dw9RbnV6x=Lzvwqfen2p+XGbDEPA@mail.gmail.com>
	<[email protected]>

2017-12-15 18:35 GMT+02:00 Devrim Gündüz <[email protected]>:
>
> I have no idea whether this patch may break other parts of Skytools or
> not, so
> not sure.


I see.

I've made another change than, that fixes PG version detection in the
sql/txid/Makefile.
With this patch I got `skytools` build fine here.


-- 
Victor Yegorov

--- a/rpm/redhat/master/skytools/master/skytools.spec
+++ b/rpm/redhat/master/skytools/master/skytools.spec
@@ -12,7 +12,7 @@
 Summary:       PostgreSQL database management tools from Skype
 Name:          %{sname}-%{pgmajorversion}
 Version:       3.2.6
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       BSD
 Group:         Applications/Databases
 Source0:       https://github.com/markokr/%{sname}/archive/%{version}.tar.gz
@@ -58,6 +58,8 @@ rmdir lib
 %if %{pgmajorversion} != 92
 sed -ie '/^#include <parser\/keywords.h>/s:parser/keywords.h:common/keywords.h:' sql/pgq/triggers/stringutil.c
 %endif
+sed -ie '/^pg83/s:shell test.*$:shell [ $( echo -e "$PGVER\\n8.3"|sort -gt. -k1 -k2|head -n1 ) = $PGVER ] \&\& echo false || echo true):' sql/txid/Makefile
+sed -ie '/^pg82/s:shell test.*$:shell [ $( echo -e "$PGVER\\n8.2"|sort -gt. -k1 -k2|head -n1 ) = $PGVER ] \&\& echo false || echo true):' sql/txid/Makefile
 ./autogen.sh
 %configure --with-pgconfig=%{pginstdir}/bin/pg_config --with-asciidoc

@@ -189,6 +191,9 @@ sed -ie '/^#include <parser\/keywords.h>/s:parser/keywords.h:common/keywords.h:'
 %{pginstdir}/share/contrib/pgq_triggers.sql

 %changelog
+* Mon Dec 18 2017 Victor Yegorov <[email protected]> - 3.2.6-2
+- Fix sql/txid/Makefile for new versioning scheme
+
 * Wed Sep 28 2016 Victor Yegorov <[email protected]> - 3.2.6-1
 - Update to 3.2.6



Attachments:

  [text/plain] 20171218-skytools-10.diff (1.4K, 3-20171218-skytools-10.diff)
  download | inline diff:
--- a/rpm/redhat/master/skytools/master/skytools.spec
+++ b/rpm/redhat/master/skytools/master/skytools.spec
@@ -12,7 +12,7 @@
 Summary:       PostgreSQL database management tools from Skype
 Name:          %{sname}-%{pgmajorversion}
 Version:       3.2.6
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       BSD
 Group:         Applications/Databases
 Source0:       https://github.com/markokr/%{sname}/archive/%{version}.tar.gz
@@ -58,6 +58,8 @@ rmdir lib
 %if %{pgmajorversion} != 92
 sed -ie '/^#include <parser\/keywords.h>/s:parser/keywords.h:common/keywords.h:' sql/pgq/triggers/stringutil.c
 %endif
+sed -ie '/^pg83/s:shell test.*$:shell [ $( echo -e "$PGVER\\n8.3"|sort -gt. -k1 -k2|head -n1 ) = $PGVER ] \&\& echo false || echo true):' sql/txid/Makefile
+sed -ie '/^pg82/s:shell test.*$:shell [ $( echo -e "$PGVER\\n8.2"|sort -gt. -k1 -k2|head -n1 ) = $PGVER ] \&\& echo false || echo true):' sql/txid/Makefile
 ./autogen.sh
 %configure --with-pgconfig=%{pginstdir}/bin/pg_config --with-asciidoc

@@ -189,6 +191,9 @@ sed -ie '/^#include <parser\/keywords.h>/s:parser/keywords.h:common/keywords.h:'
 %{pginstdir}/share/contrib/pgq_triggers.sql

 %changelog
+* Mon Dec 18 2017 Victor Yegorov <[email protected]> - 3.2.6-2
+- Fix sql/txid/Makefile for new versioning scheme
+
 * Wed Sep 28 2016 Victor Yegorov <[email protected]> - 3.2.6-1
 - Update to 3.2.6

view thread (8+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected], [email protected]
  Subject: Re: Skytools for 10 — RPM missing
  In-Reply-To: <CAGnEboibud6TtmnaJCmK9SNCpcHOKyq4+mHYMEb2EDVP2yofCg@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox