[X2Go-Commits] [x2gobroker] 02/06: x2gobroker.spec: remove obsolete EPEL 5 support.

git-admin at x2go.org git-admin at x2go.org
Tue Nov 13 04:35:56 CET 2018


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit fc746c0c9fcb3ce1e181a88e44114166aae7ddeb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 13 04:07:10 2018 +0100

    x2gobroker.spec: remove obsolete EPEL 5 support.
---
 debian/changelog |  1 +
 x2gobroker.spec  | 34 +++++-----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bdad2e..5e26119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -122,6 +122,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
       will actually generate proper debuginfo (and -source) sub packages
       owning files.
     - Whitespace only.
+    - Remove obsolete EPEL 5 support.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 05 Apr 2017 20:01:48 +0000
 
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 591bc3d..eda3a1d 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -17,10 +17,6 @@ Source2:        x2gobroker-authservice.init
 Source3:        x2gobroker-loadchecker.init
 Source4:        x2gobroker-rpmlintrc
 
-%if 0%{?el5}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
-
 %if 0%{?el6} || 0%{?el7}
 BuildRequires:  python34-devel
 BuildRequires:  python34-setuptools
@@ -390,7 +386,7 @@ echo "Files where we will be patching libexecedir:"
 find . -type f -exec grep -l "/usr/lib/x2go/" "{}" "+"
 find . -type f -exec grep -l "/usr/lib/x2go/" "{}" "+" | \
 	xargs perl -i -pe 's{/usr/lib/x2go/}{%_libexecdir/x2go/}'
-%if 0%{?el5} || 0%{?el6}
+%if 0%{?el6}
 sed -i etc/broker/x2gobroker-sessionprofiles.conf \
     -e 's/localhost-mate/localhost-gnome/' \
     -e 's/^name=MATE - localhost/name=GNOME - localhost/' \
@@ -439,17 +435,6 @@ rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-authservice
 rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-loadchecker
 rm -f %{buildroot}%{_sysconfdir}/default/python-x2gobroker
 %else
-# SysV session cleanup script
-%if 0%{?el5}
-rm -f %{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf
-mkdir -p %{buildroot}%{_initrddir}
-install -pm0755 %SOURCE3 \
-	"$b/%_initrddir/x2gobroker-loadchecker"
-install -pm0755 %SOURCE2 \
-	"$b/%_initrddir/x2gobroker-authservice"
-install -pm0755 %SOURCE1 \
-	"$b/%_initrddir/x2gobroker-daemon"
-%endif
 %if 0%{?el6} || ( 0%{?suse_version} && 0%{?suse_version} < 1140)
 rm -f %{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf
 mkdir -p "$b/%_initddir"
@@ -708,7 +693,7 @@ fi
 %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf
 %exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost
 %config %_sysconfdir/pam.d
-%if 0%{?el5} || 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
+%if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
 %config %_sysconfdir/default/python-x2gobroker
 %endif
 %python3_sitelib/x2gobroker*
@@ -718,16 +703,13 @@ fi
 
 %files authservice
 %defattr(-,root,root)
-%if 0%{?el5}
-%_initrddir/x2gobroker-authservice
-%endif
 %if 0%{?el6}
 %_initddir/x2gobroker-authservice
 %endif
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
 %{_unitdir}/x2gobroker-authservice.service
 %endif
-%if 0%{?el5} || 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
+%if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
 %config %_sysconfdir/default/x2gobroker-authservice
 %endif
 %config %_sysconfdir/logrotate.d/x2gobroker-authservice
@@ -741,16 +723,13 @@ fi
 
 %files loadchecker
 %defattr(-,root,root)
-%if 0%{?el5}
-%_initrddir/x2gobroker-loadchecker
-%endif
 %if 0%{?el6}
 %_initddir/x2gobroker-loadchecker
 %endif
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
 %{_unitdir}/x2gobroker-loadchecker.service
 %endif
-%if 0%{?el5} || 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
+%if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
 %config %_sysconfdir/default/x2gobroker-loadchecker
 %endif
 %config %_sysconfdir/logrotate.d/x2gobroker-loadchecker
@@ -765,16 +744,13 @@ fi
 %files daemon
 %defattr(-,root,root)
 %_bindir/x2gobroker-daemon
-%if 0%{?el5}
-%_initrddir/x2gobroker-daemon
-%endif
 %if 0%{?el6}
 %_initddir/x2gobroker-daemon
 %endif
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
 %{_unitdir}/x2gobroker-daemon.service
 %endif
-%if 0%{?el5} || 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
+%if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140)
 %config %_sysconfdir/default/x2gobroker-daemon
 %endif
 %_sbindir/x2gobroker-daemon-debug

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


More information about the x2go-commits mailing list