From 5fe78cce538c0d3c0b36a196fc4c03bf14a0adfc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Jun 2017 17:10:15 +0200 Subject: cleanup --- Makefile | 19 ---- remi-debug-fc.repo | 42 -------- remi-fc.repo | 14 --- remi-php70-fc.repo | 10 -- remi-php70-test-fc.repo | 10 -- remi-php71-fc.repo | 10 -- remi-php71-test-fc.repo | 10 -- remi-php72-fc.repo | 18 ---- remi-php72-test-fc.repo | 18 ---- remi-release.spec | 256 ------------------------------------------------ remi-test-fc.repo | 10 -- remi.channel | 11 --- remi.list | 11 --- 13 files changed, 439 deletions(-) delete mode 100644 remi-debug-fc.repo delete mode 100644 remi-fc.repo delete mode 100644 remi-php70-fc.repo delete mode 100644 remi-php70-test-fc.repo delete mode 100644 remi-php71-fc.repo delete mode 100644 remi-php71-test-fc.repo delete mode 100644 remi-php72-fc.repo delete mode 100644 remi-php72-test-fc.repo delete mode 100644 remi-release.spec delete mode 100644 remi-test-fc.repo delete mode 100644 remi.channel delete mode 100644 remi.list diff --git a/Makefile b/Makefile index 30ece3d..dfeb4d9 100644 --- a/Makefile +++ b/Makefile @@ -2,28 +2,9 @@ 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' - -f25: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f25.remi' --define 'fedora 25' - -f24: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f24.remi' --define 'fedora 24' - -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-debug-fc.repo b/remi-debug-fc.repo deleted file mode 100644 index c8e1792..0000000 --- a/remi-debug-fc.repo +++ /dev/null @@ -1,42 +0,0 @@ -[remi-debuginfo] -name=Remi's RPM repository for Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-remi/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-test-debuginfo] -name=Remi's test RPM repository for Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test/$basearch/ -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 Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php70/$basearch/ -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 Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test70/$basearch/ -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 Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php71/$basearch/ -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 Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test71/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - diff --git a/remi-fc.repo b/remi-fc.repo deleted file mode 100644 index 4958713..0000000 --- a/remi-fc.repo +++ /dev/null @@ -1,14 +0,0 @@ -# Repository: http://rpms.remirepo.net/ -# Blog: http://blog.remirepo.net/ -# Forum: http://forum.remirepo.net/ - - -[remi] -name=Remi's RPM repository - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/remi/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/remi/mirror -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php70-fc.repo b/remi-php70-fc.repo deleted file mode 100644 index a6d0804..0000000 --- a/remi-php70-fc.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php70] -name=Remi's RPM repository - PHP 7.0 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/php70/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php70/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php70-test-fc.repo b/remi-php70-test-fc.repo deleted file mode 100644 index 4bf2f2c..0000000 --- a/remi-php70-test-fc.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php70-test] -name=Remi's RPM repository - Testing - PHP 7.0 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test70/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test70/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php70" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php71-fc.repo b/remi-php71-fc.repo deleted file mode 100644 index 15ef7ec..0000000 --- a/remi-php71-fc.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php71] -name=Remi's RPM repository - PHP 7.1 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/php71/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php71/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php71-test-fc.repo b/remi-php71-test-fc.repo deleted file mode 100644 index e6a6efb..0000000 --- a/remi-php71-test-fc.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php71-test] -name=Remi's RPM repository - Testing - PHP 7.1 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test71/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test71/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php71" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi diff --git a/remi-php72-fc.repo b/remi-php72-fc.repo deleted file mode 100644 index bb01b6b..0000000 --- a/remi-php72-fc.repo +++ /dev/null @@ -1,18 +0,0 @@ -[remi-php72] -name=Remi's RPM repository - PHP 7.2 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/php72/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php72/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - -[remi-php72-debuginfo] -name=Remi's PHP 7.2 RPM repository for Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php72/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - diff --git a/remi-php72-test-fc.repo b/remi-php72-test-fc.repo deleted file mode 100644 index f44c4fc..0000000 --- a/remi-php72-test-fc.repo +++ /dev/null @@ -1,18 +0,0 @@ -[remi-php72-test] -name=Remi's RPM repository - Testing - PHP 7.2 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test72/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test72/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php72" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=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 Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test72/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi - diff --git a/remi-release.spec b/remi-release.spec deleted file mode 100644 index 1764975..0000000 --- a/remi-release.spec +++ /dev/null @@ -1,256 +0,0 @@ -# remirepo spec file for remi-release (Fedora) -# -# Copyright (c) 2006-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%if %{fedora} >= 23 -%global pkgman dnf -%else -%global pkgman yum -%endif - -Name: remi-release -Version: %{fedora} -%if %{fedora} >= 26 -Release: 2%{?dist} -%else -Release: 4%{?dist} -%endif -Summary: Configuration for remi repository -Summary(fr): Configuration pour le dépôt remi - -Group: System Environment/Base -License: GPLv2+ -URL: https://rpms.remirepo.net/ -Source0: RPM-GPG-KEY-remi -Source1: remi-fc.repo -Source2: remi-test-fc.repo -Source4: remi-php70-fc.repo -Source5: remi-php70-test-fc.repo -Source6: remi-php71-fc.repo -Source7: remi-php71-test-fc.repo -Source8: remi-debug-fc.repo -Source9: RPM-GPG-KEY-remi2017 -Source10: remi-php72-fc.repo -Source11: remi-php72-test-fc.repo - -BuildArch: noarch - -%if %{fedora} < 21 -Requires: yum -%else -Requires: /etc/yum.repos.d -%endif -Requires: fedora-release >= %{fedora} - - -%description -This package contains %{pkgman} configuration for the "remi" RPM Repository, -as well as the public GPG keys used to sign them. - -The repository is not enabled after installation, so you must use -the --enablerepo=remi option for %{pkgman}. -%if %{fedora} >= 25 -For PHP 7.2 you must enable the remi-php72 repository: - %{pkgman} config-manager --enable remi-php71 -%endif -%if %{fedora} >= 22 && %{fedora} <= 25 -For PHP 7.1 you must enable the remi-php71 repository: - %{pkgman} config-manager --enable remi-php71 -%endif -%if %{fedora} >= 21 && %{fedora} <= 24 -For PHP 7.0 you must enable the remi-php70 repository: - %{pkgman} config-manager --enable remi-php70 -%endif -FAQ: https://blog.remirepo.net/pages/English-FAQ -Forum: https://forum.remirepo.net/ - -%description -l fr -Ce paquetage contient le fichier de configuration de %{pkgman} pour utiliser -les RPM du dépôt "remi" ainsi que la clé GPG utilisée pour les signer. - -Le dépôt n'est pas activé après l'installation, vous devez donc utiliser -l'option --enablerepo=remi de %{pkgman}. -%if %{fedora} >= 25 -Pour PHP 7.2 vous devez activer le dépôt remi-php71 - %{pkgman} config-manager --enable remi-php71 -%endif -%if %{fedora} >= 22 && %{fedora} <= 25 -Pour PHP 7.1 vous devez activer le dépôt remi-php71 - %{pkgman} config-manager --enable remi-php71 -%endif -%if %{fedora} >= 21 && %{fedora} <= 24 -Pour PHP 7.0 vous devez activer le dépôt remi-php70 - %{pkgman} config-manager --enable remi-php70 -%endif -FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais -Forum: https://forum.remirepo.net/ - - -%prep -%setup -c -T - - -%build -echo empty build - - -%install -rm -rf %{buildroot} - -# PGP -install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi -install -Dp -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017 - -# YUM -install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo -install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo -%if %{fedora} >= 21 && %{fedora} <= 24 -install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70.repo -install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70-test.repo -%endif -%if %{fedora} >= 22 && %{fedora} <= 25 -install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71.repo -install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71-test.repo -%endif -%if %{fedora} >= 25 -install -Dp -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72.repo -install -Dp -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72-test.repo -%endif -%if %{fedora} >= 23 -install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo -%endif - -%if %{fedora} >= 26 -: Use new GPG Key -sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \ - -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo -%endif - - -%files -%config(noreplace) %{_sysconfdir}/yum.repos.d/remi*.repo -%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi* - - -%changelog -* Thu Jun 29 2017 Remi Collet - 26-2, 25-4 -- add remi-php72 repository configuration - -* Mon Mar 6 2017 Remi Collet - 26-1, 25-3 and 24-3 -- Add the GPG Key used for Fedora 26 - -* Sun Sep 11 2016 Remi Collet - 25-1 -- Fedora release 25 - -* Thu Jun 30 2016 Remi Collet - 22-4, 23-4 and 24-2 -- add remi-php71 repository configuration -- add debuginfo repository configuration - -* Fri Mar 4 2016 Remi Collet - 24-1.fc24 -- Fedora release 24 - -* Fri Jan 15 2016 Remi Collet - %{fedora}-3.fc%{fedora}.remi -- add remi-php70-test repository - -* Fri Aug 28 2015 Remi Collet - 23-1.fc23.remi -- Fedora release 23 - -* Thu Jul 23 2015 Remi Collet - ##-2.fc##.remi -- add php70 repository -- update repository configuration for new "remirepo.net" domain - -* Fri Feb 27 2015 Remi Collet - 22-1.fc22.remi -- Fedora release 22 - -* Sun Aug 31 2014 Remi Collet - 21-1.fc21.remi -- Fedora release 21 -- drop dependency on yum, as dnf exists - -* Sun Aug 31 2014 Remi Collet - 20-3.fc20.remi -- split configuration, one file per repository -- add failovermethod=roundrobin for yum -- add fastestmirror=1 for dnf > 0.4 -- drop apt configuration - -* Fri Feb 28 2014 Remi Collet - 19-2 and 20-2 -- add php56 repository - -* Tue Sep 10 2013 Remi Collet - 20-1.fc20.remi -- Fedora release 20 (Heisenbug) - -* Wed Apr 24 2013 Remi Collet - 19-1.fc19.remi -- Fedora release 19 (Schrödinger's Cat) - -* Sun Oct 21 2012 Remi Collet - 18-1.fc18.remi -- Fedora release 18 (Spherical Cow) - -* Tue Jun 26 2012 Remi Collet - 17-7.fc17.remi -- remove post scriptlet (smart stuff) - -* Sat May 05 2012 Remi Collet - 17-6.fc17.remi -- Fedora release 17 (Beefy Miracle) -- drop Smart config - -* Sun Oct 02 2011 Remi Collet - 16-6.fc16.remi -- F16 build - Verne - -* Sat Apr 16 2011 Remi Collet - 15-6.fc15.remi -- F15 build - Lovelock - -* Wed Sep 22 2010 Remi Collet - 14-6.fc14.remi -- F14 build - Laughlin - -* Sat May 01 2010 Remi Collet - ##-6.fc##.remi -- use a mirrorlist URL - -* Sat Apr 17 2010 Remi Collet - 13-5.fc13.remi -- F13 build - Goddard - -* Fri Nov 06 2009 Remi Collet - 12-5.fc12.remi -- F12 build - -* Thu Apr 30 2009 Remi Collet - ##-5.fc##.remi -- F11 build -- new repo layout - -* Wed Nov 12 2008 Remi Collet - 10-4.fc10.remi -- F10 build -- remove old site (remi.collet.free.fr) - -* Wed May 7 2008 Remi Collet - 9-4.fc9.remi -- F9 build - -* Sat Feb 2 2008 Remi Collet - {3-8}-4.fc{3-8}.remi -- new mirror http://rpms.famillecollet.com/ - -* Fri Nov 02 2007 Remi Collet - 8-3.fc8.remi -- F8 build - -* Thu Aug 23 2007 Remi Collet - {3-5}-3.fc{3-5}.remi -- update smart.channel during %%post only on fc > 5 - -* Sun Jun 24 2007 Remi Collet - {3-7}-2.el4.remi -- New key (email change, same ID) - -* Sun May 20 2007 Remi Collet - 7-1.fc7.remi -- F-7 rebuild - -* Sat Mar 24 2007 Remi Collet - 6-1.fc6.remi -- add remi.channel for smart -- add remi.list for apt - -* Mon Nov 20 2006 Remi Collet - 1-2.fc6.remi -- change mirror list (iut-info.ens.univ-reims.fr to iut-info.univ-reims.fr) - -* Tue Oct 24 2006 Remi Collet - 1-1.fc6.remi -- open FC6 repo - -* Sun Mar 26 2006 Remi Collet - 1-1.fc5.remi -- open FC5 repo - -* Tue Jan 03 2006 Remi Collet - 1-1.fc{3,4}.remi -- initial package diff --git a/remi-test-fc.repo b/remi-test-fc.repo deleted file mode 100644 index bfd9013..0000000 --- a/remi-test-fc.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-test] -name=Remi's RPM repository - Testing - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test/$basearch/ -mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=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