[X2Go-Commits] [pinentry-x2go] 01/04: pinentry-x2go.spec: remove old distro support.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pinentry-x2go.

commit da3d162a89bf36a9087dc9cd57d1bc982f1beb00
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 11 23:57:51 2018 +0100

    pinentry-x2go.spec: remove old distro support.
---
 debian/changelog   |  1 +
 pinentry-x2go.spec | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8630d4b..54214a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low
   * pinentry-x2go.spec:
     - Pull in redhat-rpm-config manually. This should probably be done by
       something else, like... gcc or qmake or qt(4)-dev, but it isn't.
+    - Remove old distro support.
 
   [ Mike Gabriel ]
   * New upstream version (0.7.5.10):
diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec
index b2f780d..2b8a377 100644
--- a/pinentry-x2go.spec
+++ b/pinentry-x2go.spec
@@ -7,18 +7,10 @@ License:        GPL-2.0
 URL:            http://www.x2go.org/
 Source0:        http://code.x2go.org/releases/source/%name/%name-%version.tar.gz
 
-%if 0%{?el5}
-# For compatibility with EPEL5
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%else
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
 BuildRequires:  autoconf >= 2.57, automake >= 1.7.6
-%if 0%{!?fe19} || 0%{!?fe20}
-BuildRequires:  gcc-c++
-%endif
 BuildRequires:  ncurses-devel
-%if 0%{?el5} || 0%{?el6}
+%if 0%{?el6}
 BuildRequires:  qt4-devel
 %else
 BuildRequires:  qt-devel
@@ -41,9 +33,6 @@ x2goclient.
 %setup -q
 
 %build
-%if 0%{?el5}
-export PATH=%{_libdir}/qt4/bin:$PATH
-%endif
 if [ ! -e configure ]; then
 	autoreconf -fi;
 fi;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git