From 9a2e5d4269613bce5723232d994998dc400be153 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Jun 2017 17:12:23 +0200 Subject: cleanup --- Makefile | 13 ---- remi-php54.repo | 12 ---- remi-php70.repo | 34 --------- remi-php71.repo | 34 --------- remi-php72.repo | 34 --------- remi-release-el.spec | 194 --------------------------------------------------- remi-safe.repo | 19 ----- remi.channel | 11 --- remi.list | 11 --- 9 files changed, 362 deletions(-) delete mode 100644 remi-php54.repo delete mode 100644 remi-php70.repo delete mode 100644 remi-php71.repo delete mode 100644 remi-php72.repo delete mode 100644 remi-release-el.spec delete mode 100644 remi-safe.repo delete mode 100644 remi.channel delete mode 100644 remi.list diff --git a/Makefile b/Makefile index 30ece3d..36351ed 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,6 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile -el5: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el5.remi' --define 'rhel 5' - -el6: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el6.remi' --define 'rhel 6' - -el7: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el7.remi' --define 'rhel 7' - f26: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f26.remi' --define 'fedora 26' @@ -23,7 +14,3 @@ f24: f23: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f23.remi' --define 'fedora 23' -f22: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f22.remi' --define 'fedora 22' - - diff --git a/remi-php54.repo b/remi-php54.repo deleted file mode 100644 index c363c41..0000000 --- a/remi-php54.repo +++ /dev/null @@ -1,12 +0,0 @@ -# This repository only provides PHP 5.4 and its extensions -# NOTICE: common dependencies are in "remi-safe" - -[remi-php54] -name=Remi's PHP 5.4 RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php54/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php54/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php54/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - diff --git a/remi-php70.repo b/remi-php70.repo deleted file mode 100644 index 800efe8..0000000 --- a/remi-php70.repo +++ /dev/null @@ -1,34 +0,0 @@ -# This repository only provides PHP 7.0 and its extensions -# NOTICE: common dependencies are in "remi-safe" - -[remi-php70] -name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php70/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php70/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php70/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php70-debuginfo] -name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php70/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php70-test] -name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test70/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test70/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test70/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php70-test-debuginfo] -name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test70/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php71.repo b/remi-php71.repo deleted file mode 100644 index 06d1b98..0000000 --- a/remi-php71.repo +++ /dev/null @@ -1,34 +0,0 @@ -# This repository only provides PHP 7.1 and its extensions -# NOTICE: common dependencies are in "remi-safe" - -[remi-php71] -name=Remi's PHP 7.1 RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php71/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php71/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php71/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php71-debuginfo] -name=Remi's PHP 7.1 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php71/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php71-test] -name=Remi's PHP 7.1 test RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test71/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test71/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test71/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php71-test-debuginfo] -name=Remi's PHP 7.1 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test71/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php72.repo b/remi-php72.repo deleted file mode 100644 index 5f5d970..0000000 --- a/remi-php72.repo +++ /dev/null @@ -1,34 +0,0 @@ -# This repository only provides PHP 7.2 and its extensions -# NOTICE: common dependencies are in "remi-safe" - -[remi-php72] -name=Remi's PHP 7.2 RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php72/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php72/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php72/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php72-debuginfo] -name=Remi's PHP 7.2 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php72/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php72-test] -name=Remi's PHP 7.2 test RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test72/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test72/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test72/mirror -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php72-test-debuginfo] -name=Remi's PHP 7.2 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test72/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-release-el.spec b/remi-release-el.spec deleted file mode 100644 index 1aa40c1..0000000 --- a/remi-release-el.spec +++ /dev/null @@ -1,194 +0,0 @@ -# remirepo spec file for remi-release (RHEL, CentOS) -# -# Copyright (c) 2006-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -Name: remi-release -%if %{rhel} == 7 -Version: 7.3 -Release: 1%{?dist} -%endif -%if %{rhel} == 6 -Version: 6.8 -Release: 2%{?dist} -%endif -%if %{rhel} == 5 -Version: 5.10 -Release: 1%{?dist} -%endif -Summary: YUM configuration for remi repository -Summary(fr): Configuration de YUM pour le dépôt remi - -Group: System Environment/Base -License: GPL -URL: http://remirepo.net -Source0: RPM-GPG-KEY-remi -Source1: remi-el.repo -Source2: remi-safe.repo -Source3: remi-php70.repo -Source4: remi-php71.repo -Source5: remi-php54.repo - -BuildRoot: %{_tmppath}/%{name}-%{version} -BuildArchitectures: noarch - -Requires: yum -# Sadly system-release and redhat-release are not versionned -Requires: redhat-release -Requires: epel-release = %{rhel} -# Ensure not installable on Fedora -Conflicts: fedora-release - - -%description -This package contains yum configuration for the Remi's RPM Repository, -as well as the public GPG keys used to sign them. -%if %{rhel} >= 6 -Only the "remi-safe" repository is enabled after installation. -%else -The repository is not enabled after installation. -%endif -For PHP 5.6 you must enable the remi-php56 repository: - yum-config-manager --enable remi-php56 - -For PHP 7.0 you must enable the remi-php70 repository: - yum-config-manager --enable remi-php70 - -For PHP 7.1 you must enable the remi-php71 repository: - yum-config-manager --enable remi-php71 - -%if %{rhel} >= 6 -Software Collections are in the "remi-safe" repository. -%endif -FAQ: http://blog.remirepo.net/pages/English-FAQ -Forum: http://forum.remirepo.net/ - -%description -l fr -Ce paquetage contient le fichier de configuration de YUM pour utiliser -les RPM du dépôt de Remi ainsi que la clé GPG utilisée pour les signer. -%if %{rhel} >= 6 -Seul le dépôt "remi-safe" est activé après l'installation. -%else -Le dépôt n'est pas activé après l'installation. -%endif -Pour PHP 5.6 vous devez activer le dépôt remi-php56 - yum-config-manager --enable remi-php56 - -Pour PHP 7.0 vous devez activer le dépôt remi-php70 - yum-config-manager --enable remi-php70 - -Pour PHP 7.1 vous devez activer le dépôt remi-php71 - yum-config-manager --enable remi-php71 - -%if %{rhel} >= 6 -Les "Software Collections" sont dans le dépôt "remi-safe". -%endif -FAQ: http://blog.remirepo.net/pages/FAQ-en-Francais -Forum: http://forum.remirepo.net/ - - -%prep -%setup -c -T -sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo - -%if %{rhel} >= 6 -sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo -sed -e "s/VERSION/%{rhel}/" %{SOURCE3} | tee remi-php70.repo -sed -e "s/VERSION/%{rhel}/" %{SOURCE4} | tee remi-php71.repo -sed -e "s/VERSION/%{rhel}/" %{SOURCE5} | tee remi-php54.repo -%endif - - -%build -echo empty build - - -%install -rm -rf %{buildroot} - -# PGP -install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi - -# YUM -for repo in *repo -do - install -Dp -m 644 $repo %{buildroot}%{_sysconfdir}/yum.repos.d/$repo -done - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/yum.repos.d/remi*repo -%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi - - -%changelog -* Fri Feb 10 2017 Remi Collet - 6.8-2 and 7.3-1 -- add remi-php54 repository -- add mirrorlist for https mirrors (as comment) - -* Thu Jun 30 2016 Remi Collet - 6.8-1 and 7.2-1 -- add remi-php71 repository - -* Wed Dec 9 2015 Remi Collet - 6.6-2 and 7.1-3 -- add remi-php70-test repository -- fix information, remi is not more required by remi-phpxx - -* Fri Jul 24 2015 Remi Collet - 6.6-1 -- add remi-safe repository - -* Thu Jul 23 2015 Remi Collet - 7.1-2 and 6.5-2 -- add remi-php70 repository - -* Tue Jun 2 2015 Remi Collet - 7.1-1 -- add remi-safe repository -- translate repository name -- update repository configuration for "remirepo.net" domain - -* Thu Apr 24 2014 Remi Collet - 7.0-1 -- EL-7 build - -* Fri Feb 28 2014 Remi Collet - 5.10-1 and 6.5-1 -- add php56 repository - -* Thu Oct 3 2013 Remi Collet - 5.9-1 and 6.4-1 -- add php55 repository - -* Tue Feb 12 2013 Remi Collet - 5-9 and 6-2 -- add debuginfo repo -- drop failovermethod option (switch to roundrobin) - -* Sat Nov 13 2010 Remi Collet - 6-1.el6.remi -- EL-6 rebuild - -* Sat May 01 2010 Remi Collet - 5-8.el5.remi -- use a mirrorlist URL - -* Sun May 03 2009 Remi Collet - 5-7.el5.remi -- new repo layout - -* Thu Jan 22 2009 Remi Collet - 5-6.el5.remi -- fix bad $releasever in remi.repo (5Server doesn't work) - -* Tue Jan 20 2009 Remi Collet - 5-5.el5.remi -- remove free.fr mirror - -* Sat Feb 2 2008 Remi Collet - 5-4.el5.remi -- new mirror http://rpms.famillecollet.com/ - -* Sat Nov 17 2007 Remi Collet - 5-3.el5.remi -- add requires epel-release - -* Sun Jun 24 2007 Remi Collet - 5-2.el5.remi -- New key (email change, same ID) - -* Sat May 26 2007 Remi Collet - 5-1.el5.remi -- EL-5 rebuild - diff --git a/remi-safe.repo b/remi-safe.repo deleted file mode 100644 index b6f28a5..0000000 --- a/remi-safe.repo +++ /dev/null @@ -1,19 +0,0 @@ -# This repository is safe to use with RHEL/CentOS base repository -# it only provides additional packages for the PHP stack -# all dependencies are in base repository or in EPEL - -[remi-safe] -name=Safe Remi's RPM repository for Enterprise Linux VERSION - $basearch -#baseurl=http://rpms.remirepo.net/enterprise/VERSION/safe/$basearch/ -#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/safe/httpsmirror -mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/safe/mirror -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-safe-debuginfo] -name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi.channel b/remi.channel deleted file mode 100644 index f792a2a..0000000 --- a/remi.channel +++ /dev/null @@ -1,11 +0,0 @@ -[remi] -name=Les RPM de remi pour Fedora VERSION -baseurl=http://remi.collet.free.fr/rpms/fcVERSION.ARCH/ -disabled=yes -type=rpm-md - -[remi-test] -name=Les RPM de remi en test pour Fedora VERSION -baseurl=http://remi.collet.free.fr/rpms/test-fcVERSION.ARCH/ -disabled=yes -type=rpm-md diff --git a/remi.list b/remi.list deleted file mode 100644 index e297519..0000000 --- a/remi.list +++ /dev/null @@ -1,11 +0,0 @@ -# Remi repositories sources.list entries for apt-rpm with repomd support, -# http://apt-rpm.laiskiainen.org/ - -# Uncomment the repomd line to activate the repo - -# -- remi repository -#repomd http://rpms.famillecollet.com/ fc$(VERSION).$(ARCH) - -# -- remi-test repository -#repomd http://rpms.famillecollet.com/ test-fc$(VERSION).$(ARCH) - -- cgit