From c9ef45aec2d38aad0b93057a3fb789f5db66f7c2 Mon Sep 17 00:00:00 2001
From: aviau <alexandre@alexandreviau.net>
Date: Tue, 26 Jul 2016 11:21:18 -0400
Subject: [PATCH] No longer install repositories with ring-daemon
As discussed on the mailing list[1], ring-daemon will no longer install
repositories for the user. The recommended way of using our packages is
installing the repositories and then installing ring with your package
manager. Users that decide to install packages manually can still do so
but they will have to handle updates themselves.
1. https://lists.savoirfairelinux.net/pipermail/ring/2016-July/002620.html
Change-Id: If581b7df26f24e5cc61b69c375b03fb74b57c996
Tuleap: #591
---
debian/rules | 5 -----
ring-daemon.spec | 8 --------
2 files changed, 13 deletions(-)
diff --git a/debian/rules b/debian/rules
index d6ae9f5002..fb6a2f4850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ PKD = $(abspath $(dir $(MAKEFILE_LIST)))
#PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source))
PKG = $(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source)
VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-DISTRIB_ID = $(shell grep -hPo "^ID=\K.*" /etc/*ease)
-DISTRIB_VERSION_ID = $(shell grep -hPo "^VERSION_ID=\K.*" /etc/*ease)
DAEMON_TAG = origin/master
@@ -45,9 +43,6 @@ override_dh_auto_install:
mkdir -p $(CURDIR)/debian/ring-daemon-dev/usr/include/dring
mv $(CURDIR)/debian/ring-daemon/usr/include/dring/* $(CURDIR)/debian/ring-daemon-dev/usr/include/dring
rm -rf $(CURDIR)/debian/ring-daemon/usr/include/
- # Add repository file
- mkdir -p $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/
- echo "deb http://nightly.apt.ring.cx/$(DISTRIB_ID)_$(DISTRIB_VERSION_ID) ring main" > $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/ring-nightly.list
dh_auto_install
get-orig-source:
diff --git a/ring-daemon.spec b/ring-daemon.spec
index ed7c709491..2ed98ebfc8 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -65,14 +65,6 @@ make -j %{?_smp_mflags}
%install
mkdir -p %{buildroot}/ring-daemon
make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}/%{_sysconfdir}/yum.repos.d/
-echo '[ring]' > %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-echo 'name=Ring - $basearch - Nightly' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-echo 'baseurl=http://nightly.yum.ring.cx/fedora_$releasever' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-echo 'gpgcheck=1' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-echo 'gpgkey=http://gpl.savoirfairelinux.net/ring-download/ring.pub.key' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-echo 'enabled=1' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
-
%files
%defattr(-,root,root,-)
--
GitLab