From 9d87e57e0ef35e97261e96e65c121aec2459f8c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 11 Sep 2016 09:48:04 +0200 Subject: F25 build stuff --- Makefile | 8 +++----- remi-release.spec | 7 +++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5b3760a..44f9478 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' +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' @@ -20,9 +23,4 @@ f23: f22: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f22.remi' --define 'fedora 22' -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-release.spec b/remi-release.spec index d6f3cef..da6c23d 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -14,11 +14,15 @@ Name: remi-release Version: %{fedora} +%if %{fedora} >= 25 +Release: 1%{?dist} +%else %if %{fedora} >= 24 Release: 2%{?dist} %else Release: 4%{?dist} %endif +%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -125,6 +129,9 @@ rm -rf %{buildroot} %changelog +* 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 -- cgit