Skip to content

Commit

Permalink
Fedora 24 repository
Browse files Browse the repository at this point in the history
  • Loading branch information
@remicollet
remicollet committed Mar 4, 2016
1 parent 78a9b63 commit d18e4c4
Show file tree
Hide file tree
Showing 14 changed files with 1,137 additions and 87 deletions.
5 changes: 3 additions & 2 deletions remi-release/Makefile
View file
Expand Up @@ -11,6 +11,9 @@ el6:
el7:
rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el7.remi' --define 'rhel 7'

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'

Expand All @@ -23,5 +26,3 @@ f21:
f20:
rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f20.remi' --define 'fedora 20'

f19:
rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f19.remi' --define 'fedora 19'
35 changes: 24 additions & 11 deletions remi-release/remi-release.spec
View file
Expand Up @@ -6,11 +6,21 @@
#
# Please, preserve the changelog entries
#
%if %{fedora} >= 23
%global pkgman dnf
%else
%global pkgman yum
%endif

Name: remi-release
Version: %{fedora}
%if %{fedora} >= 24
Release: 1%{?dist}
%else
Release: 3%{?dist}
Summary: YUM configuration for remi repository
Summary(fr): Configuration de YUM pour le dépôt remi
%endif
Summary: Configuration for remi repository
Summary(fr): Configuration pour le dépôt remi

Group: System Environment/Base
License: GPLv2+
Expand All @@ -34,27 +44,27 @@ Requires: fedora-release >= %{fedora}


%description
This package contains yum configuration for the "remi" RPM Repository,
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 yum.
%if %{fedora} >= 21 && %{fedora} <= 23
the --enablerepo=remi option for %{pkgman}.
%if %{fedora} >= 21 && %{fedora} <= 24
For PHP 7.0 you must enable the remi-php70 repository:
dnf config-manager --enable remi-php70
%{pkgman} config-manager --enable remi-php70
%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
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 yum.
%if %{fedora} >= 21 && %{fedora} <= 23
l'option --enablerepo=remi de %{pkgman}.
%if %{fedora} >= 21 && %{fedora} <= 24
Pour PHP 7.0 vous devez activer le dépôt remi-php70
dnf config-manager --enable remi-php70
%{pkgman} config-manager --enable remi-php70
%endif
FAQ: http://blog.remirepo.net/pages/FAQ-en-Francais
Forum: http://forum.remirepo.net/
Expand All @@ -80,7 +90,7 @@ install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.r
%if %{fedora} >= 19 && %{fedora} <= 20
install -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php56.repo
%endif
%if %{fedora} >= 21 && %{fedora} <= 23
%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
Expand All @@ -97,6 +107,9 @@ rm -rf %{buildroot}


%changelog
* Fri Mar 4 2016 Remi Collet <remi@remirepo.net> - 24-1.fc24
- Fedora release 24

* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - %{fedora}-3.fc%{fedora}.remi
- add remi-php70-test repository

Expand Down
83 changes: 11 additions & 72 deletions tools/buildfct
View file
Expand Up @@ -4,76 +4,6 @@ alias msrpm='rpmbuild -bs --define "_source_filedigest_algorithm 0" --define "_
alias rhpkg='echo NO PLEASE, use fedpkg'

mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
#alias mockfc3="setarch i686 mock -r fc3 --arch i386 rebuild "
#alias mockfc4="setarch i686 mock -r fc4 --arch i386 rebuild "
#alias mockfc5="setarch i686 mock -r fc5 --arch i386 rebuild "
#alias mockfc6x=" mock --configdir=$mocketc -r fc6x rebuild "
#alias mockfc7i="setarch i686 mock --configdir=$mocketc -r fc7i --arch i386 rebuild "
#alias mockfc7x=" mock --configdir=$mocketc -r fc7x rebuild "

#alias mockfc6i="setarch i686 mock --configdir=$mocketc -r fc6i --arch i386 rebuild "
#alias mockfc8i="setarch i686 mock --configdir=$mocketc -r fc8i --arch i386 rebuild "
#alias mockfc8x=" mock --configdir=$mocketc -r fc8x rebuild "
#alias mockfc9i="setarch i686 mock --configdir=$mocketc -r fc9i --arch i386 rebuild "
#alias mockfc9x=" mock --configdir=$mocketc -r fc9x rebuild "
#alias mockfc9it="setarch i686 mock --configdir=$mocketc -r fc9it --arch i386 rebuild "
#alias mockfc9xt=" mock --configdir=$mocketc -r fc9xt rebuild "
#alias mockfc10i="setarch i686 mock --configdir=$mocketc -r fc10i --arch i386 rebuild "
#alias mockfc10x=" mock --configdir=$mocketc -r fc10x rebuild "
#alias mockfc10it="setarch i686 mock --configdir=$mocketc -r fc10it --arch i386 rebuild "
#alias mockfc10xt=" mock --configdir=$mocketc -r fc10xt rebuild "

#alias mockfc11i="setarch i686 mock --configdir=$mocketc -r fc11i --arch i586 rebuild "
#alias mockfc11x=" mock --configdir=$mocketc -r fc11x rebuild "
#alias mockfc11it="setarch i686 mock --configdir=$mocketc -r fc11it --arch i586 rebuild "
#alias mockfc11xt=" mock --configdir=$mocketc -r fc11xt rebuild "

#alias mockfc12i="setarch i686 mock --configdir=$mocketc -r fc12i --arch i686 rebuild "
#alias mockfc12it="setarch i686 mock --configdir=$mocketc -r fc12it --arch i686 rebuild "
#alias mockfc12x=" mock --configdir=$mocketc -r fc12x rebuild "
#alias mockfc12xt=" mock --configdir=$mocketc -r fc12xt rebuild "

#alias mockfc13i="setarch i686 mock --configdir=$mocketc -r fc13i --arch i686 rebuild "
#alias mockfc13it="setarch i686 mock --configdir=$mocketc -r fc13it --arch i686 rebuild "
#alias mockfc13x=" mock --configdir=$mocketc -r fc13x rebuild "
#alias mockfc13xt=" mock --configdir=$mocketc -r fc13xt rebuild "

#alias mockfc14i="setarch i686 mock --configdir=$mocketc -r fc14i --arch i686 rebuild "
#alias mockfc14it="setarch i686 mock --configdir=$mocketc -r fc14it --arch i686 rebuild "
#alias mockfc14x=" mock --configdir=$mocketc -r fc14x rebuild "
#alias mockfc14xt=" mock --configdir=$mocketc -r fc14xt rebuild "

#alias mockfc15i="setarch i686 mock --configdir=$mocketc -r fc15i --arch i686 rebuild "
#alias mockfc15it="setarch i686 mock --configdir=$mocketc -r fc15it --arch i686 rebuild "
#alias mockfc15x=" mock --configdir=$mocketc -r fc15x rebuild "
#alias mockfc15xt=" mock --configdir=$mocketc -r fc15xt rebuild "

#alias mockfc16i="setarch i686 mock --configdir=$mocketc -r fc16i --arch i686 rebuild "
#alias mockfc16it="setarch i686 mock --configdir=$mocketc -r fc16it --arch i686 rebuild "
#alias mockfc16x=" mock --configdir=$mocketc -r fc16x rebuild "
#alias mockfc16xt=" mock --configdir=$mocketc -r fc16xt rebuild "
#alias mockfc16xd=" mock --configdir=$mocketc -r fc16xd rebuild "

#lias mockfc17i="setarch i686 mock --configdir=$mocketc -r fc17i --arch i686 rebuild "
#lias mockfc17it="setarch i686 mock --configdir=$mocketc -r fc17it --arch i686 rebuild "
#lias mockfc17x=" mock --configdir=$mocketc -r fc17x rebuild "
#lias mockfc17xt=" mock --configdir=$mocketc -r fc17xt rebuild "
#lias mockfc17xd=" mock --configdir=$mocketc -r fc17xd rebuild "

#lias mockfc18i="setarch i686 mock --configdir=$mocketc -r fc18i --arch i686 rebuild "
#lias mockfc18it="setarch i686 mock --configdir=$mocketc -r fc18it --arch i686 rebuild "
#lias mockfc18x=" mock --configdir=$mocketc -r fc18x rebuild "
#lias mockfc18xt=" mock --configdir=$mocketc -r fc18xt rebuild "
#lias mockfc18xd=" mock --configdir=$mocketc -r fc18xd rebuild "

#lias mockfc19i=" setarch i686 mock --configdir=$mocketc -r fc19i --arch i686 rebuild "
#lias mockfc19i56="setarch i686 mock --configdir=$mocketc -r fc19i56 --arch i686 rebuild "
#lias mockfc19x=" mock --configdir=$mocketc -r fc19x rebuild "
#lias mockfc19xt=" mock --configdir=$mocketc -r fc19xt rebuild "
#lias mockfc19x56=" mock --configdir=$mocketc -r fc19x56 rebuild "
#lias mockfc19xscl54=" mock --configdir=$mocketc -r fc19xscl54 rebuild "
#lias mockfc19xscl56=" mock --configdir=$mocketc -r fc19xscl56 rebuild "
#lias mockfc19xd=" mock --configdir=$mocketc -r fc19xd rebuild "

alias mockfc20i=" setarch i686 mock --configdir=$mocketc -r fc20i --arch i686 rebuild "
alias mockfc20i56="setarch i686 mock --configdir=$mocketc -r fc20i56 --arch i686 rebuild "
Expand Down Expand Up @@ -116,6 +46,15 @@ alias mockfc23xscl55=" mock --configdir=$mocketc -r fc23xscl55
alias mockfc23xscl56=" mock --configdir=$mocketc -r fc23xscl56 rebuild "
alias mockfc23xscl70=" mock --configdir=$mocketc -r fc23xscl70 rebuild "

alias mockfc24i=" setarch i686 mock --configdir=$mocketc -r fc24i --arch i686 rebuild "
alias mockfc24i70="setarch i686 mock --configdir=$mocketc -r fc24i70 --arch i686 rebuild "
alias mockfc24x=" mock --configdir=$mocketc -r fc24x rebuild "
alias mockfc24x70=" mock --configdir=$mocketc -r fc24x70 rebuild "
alias mockfc24xscl54=" mock --configdir=$mocketc -r fc24xscl54 rebuild "
alias mockfc24xscl55=" mock --configdir=$mocketc -r fc24xscl55 rebuild "
alias mockfc24xscl56=" mock --configdir=$mocketc -r fc24xscl56 rebuild "
alias mockfc24xscl70=" mock --configdir=$mocketc -r fc24xscl70 rebuild "

#alias mockel4i="setarch i686 mock --configdir=$mocketc -r el4i --arch i386 rebuild "
#alias mockel4it="setarch i686 mock --configdir=$mocketc -r el4it --arch i386 rebuild "
#alias mockel4x=" mock --configdir=$mocketc -r el4x rebuild "
Expand Down Expand Up @@ -171,7 +110,7 @@ if [ "$1" = "-q" ]; then
fi

if [ -f "$1" ]; then
for i in 23 22 21 20
for i in 24 23 22 21 20
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
Expand Down Expand Up @@ -307,7 +246,7 @@ if [ "$1" = "-q" ]; then
fi

if [ -f "$1" ]; then
for i in 23 22 21 20
for i in 24 23 22 21 20
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
Expand Down
4 changes: 2 additions & 2 deletions tools/mkallrepo
View file
Expand Up @@ -6,7 +6,7 @@ TMPLNK=$(mktemp)
cd /home/rpmbuild/site/rpms

#for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
for dep in fedora/{20,21,22,23}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
for dep in fedora/{20,21,22,23,24}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
do
arch=${dep##*/}

Expand Down Expand Up @@ -51,7 +51,7 @@ else echo "Rien à lier."
fi

#for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
for dep in SRPMS fedora/{20,21,22,23}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
for dep in SRPMS fedora/{20,21,22,23,24}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
do
if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
then echo "== Actualisation de $dep =="
Expand Down
104 changes: 104 additions & 0 deletions tools/mock/fc24i.cfg
View file
@@ -0,0 +1,104 @@
config_opts['root'] = 'fc24i'
config_opts['target_arch'] = 'i686'
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
config_opts['dist'] = 'fc24' # only useful for --resultdir variable subst

config_opts['plugin_conf']['ccache_enable'] = True
config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc24i/"

config_opts['basedir'] = '/dev/shm/'
config_opts['resultdir'] = "/var/lib/mock/fc24i"
config_opts['cleanup_on_success'] = True
config_opts['cleanup_on_failure'] = False

config_opts['createrepo_on_rpms'] = True
config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'

config_opts['macros']['%_topdir']="/builddir/build"
config_opts['macros']['%_smp_mflags']="-j6"
config_opts['macros']['%vendor']="Remi Collet"
config_opts['macros']['%packager']="http://blog.remirepo.net/"
config_opts['macros']['%bugurl']="http://forum.remirepo.net/"
config_opts['macros']['%dist']=".fc24.remi"
config_opts['macros']['%fedora']="24"
config_opts['macros']['%_with_ibase']="1"
config_opts['macros']['%_with_oci8']="1"
config_opts['macros']['%runselftest']="1"


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
# repos
[fedora]
name=fedora
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-24&arch=i386
#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/24/Everything/i386/os/
# http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/24/Everything/i386/os/
[updates-released]
name=updates
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f24&arch=i386
#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/24/i386/
# http://mirrors.ircam.fr/pub/fedora/linux/updates/24/i386/
# http://fr2.rpmfind.net/linux/fedora/updates/24/i386/
enabled=1
[updates-testing]
name=updates-testing
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f24&arch=i386
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/24/i386/
enabled=0
[remi]
name=remi public
baseurl=file:/home/rpmbuild/site/rpms/fedora/24/remi/i386/
enabled=1
[remi-priv]
name=remi prive
baseurl=file:/home/rpmbuild/site/rpms/priv/i386/
enabled=1
[remi-test]
name=remi test
baseurl=file:/home/rpmbuild/site/rpms/fedora/24/test/i386/
enabled=0
[rpmfusion-free]
name=rpmfusion-free
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-24&arch=i386
enabled=0
[rpmfusion-free-updates]
name=rpmfusion-free
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-24&arch=i386
enabled=0
[rpmfusion-nonfree]
name=rpmfusion-nonfree
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-24&arch=i386
enabled=0
[rpmfusion-nonfree-updates]
name=rpmfusion-nonfree
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-24&arch=i386
enabled=0
[resultfc24i]
name=resultfc24i
baseurl=file:/var/lib/mock/fc24i/
enabled=1
"""

0 comments on commit d18e4c4

Please sign in to comment.