summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--remi-fc.repo35
-rw-r--r--remi-php56-fc.repo10
-rw-r--r--remi-release.spec45
-rw-r--r--remi-test-fc.repo10
5 files changed, 58 insertions, 45 deletions
diff --git a/Makefile b/Makefile
index b5bb05e..9c0c724 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ el6:
el7:
rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el7.remi' --define 'rhel 7'
+f21:
+ rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f21.remi' --define 'fedora 21'
+
f20:
rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f20.remi' --define 'fedora 20'
diff --git a/remi-fc.repo b/remi-fc.repo
index 0c4fc52..44986b3 100644
--- a/remi-fc.repo
+++ b/remi-fc.repo
@@ -1,33 +1,14 @@
+# Repository: http://rpms.famillecollet.com/
+# Blog: http://blog.famillecollet.com/
+# Forum: http://forums.famillecollet.com/
+
+
[remi]
-name=Les RPM de remi pour Fedora $releasever - $basearch
+name=Les RPM de remi - Fedora $releasever - $basearch
#baseurl=http://rpms.famillecollet.com/fedora/$releasever/remi/$basearch/
mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/remi/mirror
enabled=0
gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php56]
-name=Les RPM de remi de PHP 5.6 pour Fedora $releasever - $basearch
-#baseurl=http://rpms.famillecollet.com/fedora/$releasever/php56/$basearch/
-mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/php56/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-test]
-name=Les RPM de remi en test pour Fedora $releasever - $basearch
-#baseurl=http://rpms.famillecollet.com/fedora/$releasever/test/$basearch/
-mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/test/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-dev]
-name=Les RPM experimentaux de remi pour Fedora $releasever - $basearch
-baseurl=http://rpms.famillecollet.com/fedora/$releasever/devs/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-php56-fc.repo b/remi-php56-fc.repo
new file mode 100644
index 0000000..448542a
--- /dev/null
+++ b/remi-php56-fc.repo
@@ -0,0 +1,10 @@
+[remi-php56]
+name=Les RPM de remi - PHP 5.6 - Fedora $releasever - $basearch
+#baseurl=http://rpms.famillecollet.com/fedora/$releasever/php56/$basearch/
+mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/php56/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-release.spec b/remi-release.spec
index 014b1ca..cfd6b8f 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,10 +1,14 @@
Name: remi-release
Version: %{fedora}
+%if %{fedora} >= 21
+Release: 1%{?dist}
+%else
%if %{fedora} >= 18
-Release: 2%{?dist}
+Release: 3%{?dist}
%else
Release: 7%{?dist}
%endif
+%endif
Summary: YUM configuration for remi repository
Summary(fr): Configuration de YUM pour le dépôt remi
@@ -12,14 +16,18 @@ Group: System Environment/Base
License: GPLv2+
URL: http://rpms.famillecollet.com/
Source0: RPM-GPG-KEY-remi
-Source1: remi-fc.repo
-Source3: remi.list
+Source1: remi-fc.repo
+Source2: remi-test-fc.repo
+Source3: remi-php56-fc.repo
+
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildArchitectures: noarch
+%if %{fedora} < 21
Requires: yum
+%endif
Requires: fedora-release >= %{fedora}
-Conflicts: apt < 0.5.15lorg3
+
%description
This package contains yum configuration for the "remi" RPM Repository,
@@ -28,8 +36,6 @@ 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 yum.
-It also provides apt configuration.
-
%description -l fr
Ce paquetage contient le fichier de configuration de YUM pour utiliser
les RPM du dépôt "remi" ainsi que la clé GPG utilisée pour les signer.
@@ -37,8 +43,6 @@ 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 yum.
-Il fournit également la configuration de apt.
-
%prep
%setup -c -T
@@ -56,13 +60,10 @@ install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
# YUM
install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
-
-# APT
-install -dm 755 %{buildroot}%{_sysconfdir}/apt/{gpg,sources.list.d}
-install -m 644 -p %{SOURCE3} \
- %{buildroot}%{_sysconfdir}/apt/sources.list.d/remi.list
-ln -s ../../pki/rpm-gpg/RPM-GPG-KEY-remi \
- %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-00f97f56-467e318a
+install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo
+%if %{fedora} < 21
+install -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php56.repo
+%endif
%clean
@@ -71,13 +72,21 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/yum.repos.d/remi.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/remi*.repo
%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
-%{_sysconfdir}/apt/gpg/gpg-pubkey-00f97f56-467e318a
-%config(noreplace) %{_sysconfdir}/apt/sources.list.d/remi.list
%changelog
+* Sun Aug 31 2014 Remi Collet <RPMS@FamilleCollet.com> - 21-1.fc21.remi
+- Fedora release 21
+- drop dependency on yum, as dnf exists
+
+* Sun Aug 31 2014 Remi Collet <RPMS@FamilleCollet.com> - 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 <RPMS@FamilleCollet.com> - 19-2 and 20-2
- add php56 repository
diff --git a/remi-test-fc.repo b/remi-test-fc.repo
new file mode 100644
index 0000000..927a1ee
--- /dev/null
+++ b/remi-test-fc.repo
@@ -0,0 +1,10 @@
+[remi-test]
+name=Les RPM de remi - Testing - Fedora $releasever - $basearch
+#baseurl=http://rpms.famillecollet.com/fedora/$releasever/test/$basearch/
+mirrorlist=http://rpms.famillecollet.com/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