pakfire: Rebase on latest development status.

[people/ms/ipfire-3.x.git] / pakfire / patches / 0010-Remove-testingbay-repository-from-example-configurat.patch

From 2b40137a3bfb1b8a31d5acbba32bd5e285599ba3 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 May 2012 14:30:30 +0200
Subject: [PATCH 10/16] Remove testingbay repository from example
 configuration.

---
 Makefile                      |    4 ++--
 examples/distros/ipfire3.conf |    8 +-------
 examples/repos/ipfire.repo    |   22 ----------------------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 examples/repos/ipfire.repo

diff --git a/Makefile b/Makefile
index 492d068..0361af6 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ install: build
 	cp -vf macros/*.macro $(DESTDIR)$(PREFIX)/lib/pakfire/macros
 
 	# Install example configuration.
-	-mkdir -pv $(DESTDIR)/etc/pakfire
-	for file in general.conf builder.conf client.conf daemon.conf distros repos; do \
+	-mkdir -pv $(DESTDIR)/etc/pakfire/repos
+	for file in general.conf builder.conf client.conf daemon.conf distros; do \
 		[ -e "$(DESTDIR)/etc/pakfire/$${file}" ] && continue; \
 		cp -rvf examples/$${file} $(DESTDIR)/etc/pakfire/; \
 	done
diff --git a/examples/distros/ipfire3.conf b/examples/distros/ipfire3.conf
index aed95ce..9d15bf0 100644
--- a/examples/distros/ipfire3.conf
+++ b/examples/distros/ipfire3.conf
@@ -1,5 +1,5 @@
 
-# Configuration of IPFire 3-
+# Configuration of IPFire 3.
 
 [distro]
 name = IPFire
@@ -28,9 +28,3 @@ description = IPFire 3 - This is a repository for testing stuff.
 enabled = 0
 baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
-
-[repo:testingbay]
-description = IPFire 3 - Temporary bootstrap repository.
-enabled = 1
-baseurl = http://people.ipfire.org/~ms/testingbay-%{arch}
-mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors
diff --git a/examples/repos/ipfire.repo b/examples/repos/ipfire.repo
deleted file mode 100644
index 8c9f50a..0000000
--- a/examples/repos/ipfire.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-;[repo:ipfire]
-;description = IPFire Main Repository
-;
-;url = http://mirror0.ipfire.org/pakfire3/$name/$arch
-;
-;gpgkey = /not/yet/existant
-
-;[repo:ipfire-development]
-;description = IPFire Development Repository
-
-#url = http://mirror0.ipfire.org/pakfire3/$name/$arch
-#url = file:///ipfire-3.x/build/packages/i686
-;url = file:///tmp/pakfire3
-
-;gpgkey = /not/yet/existant
-
-[repo:testingbay]
-description = IPFire Testing Repository for %{arch}
-enabled = 1
-
-mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors
-baseurl = http://people.ipfire.org/~ms/testingbay-%{arch}
-- 
1.7.10.4