[PATCH 04/11] Move all .cfg files to etc/mock directory for

better organization Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com&gt; --- Makefile | 12 ++++++------ el-round.sh | 1 + mock-kwizart.spec.in | 2 +- mock-rpmfusion-free.spec.in | 2 +- mock-rpmfusion-nonfree.spec.in | 2 +- round.sh | 7 +++++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 51500b5..0b38aa3 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ release-free : cat CHANGELOG >> mock-rpmfusion-free.spec tar cjvf mock-rpmfusion-free-$(VERSION).tar.bz2 \ - fedora-*_free.cfg \ - epel-*_free.cfg \ + etc/mock/fedora-*_free.cfg \ + etc/mock/epel-*_free.cfg \ mock-rpmfusion-free.spec release-nonfree : @@ -18,8 +18,8 @@ release-nonfree : cat CHANGELOG >> mock-rpmfusion-nonfree.spec tar cjvf mock-rpmfusion-nonfree-$(VERSION).tar.bz2 \ - fedora-*_nonfree.cfg \ - epel-*_nonfree.cfg \ + etc/mock/fedora-*_nonfree.cfg \ + etc/mock/epel-*_nonfree.cfg \ mock-rpmfusion-nonfree.spec release-kwizart : @@ -28,8 +28,8 @@ release-kwizart : cat CHANGELOG >> mock-kwizart.spec tar cjvf mock-kwizart-$(VERSION).tar.bz2 \ - fedora-*kwizart.cfg \ - epel-*kwizart.cfg \ + etc/mock/fedora-*kwizart.cfg \ + etc/mock/epel-*kwizart.cfg \ mock-kwizart*.spec clean : diff --git a/el-round.sh b/el-round.sh index fe534ef..792299e 100755 --- a/el-round.sh +++ b/el-round.sh @@ -33,6 +33,7 @@ for arch in $ARCHES ; do #git add fedora-${fver}-${arch}-${repo}.cfg sed -i -e "s|\$basearch|${arch}|g" epel-${fver}-${arch}-${repo}.cfg sed -i -e "s|\$releasever|${fver}|g" epel-${fver}-${arch}-${repo}.cfg + mv epel-${fver}-${arch}-${repo}.cfg etc/mock #sed -i -e "s|mirrorlist=http://mirrors.rpmfusion.org|#mirrorlist=http://mirrors.rpmfusion.org|g" fedora-${fver}-${arch2}-${repo}.cfg #sed -i -e "s|kojipkgs.fedoraproject.org|sparc.koji.fedoraproject.org|g" fedora-${fver}-${arch2}-${repo}.cfg #sed -i -e "s|#baseurl=http://download1.rpmfusion.org/nonfree/fedora/|baseurl=http://download1.rpmfusion.org/nonfree/fedora-secondary/|g" fedora-${fver}-${arch2}-${repo}.cfg diff --git a/mock-kwizart.spec.in b/mock-kwizart.spec.in index 15e42a7..532d9cb 100644 --- a/mock-kwizart.spec.in +++ b/mock-kwizart.spec.in @@ -27,7 +27,7 @@ Mock config files for the rpms.kwizart.net Repository %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock -install -pm 0644 *kwizart.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock +install -pm 0644 etc/mock/*kwizart.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock %clean diff --git a/mock-rpmfusion-free.spec.in b/mock-rpmfusion-free.spec.in index ca79bee..416f11c 100644 --- a/mock-rpmfusion-free.spec.in +++ b/mock-rpmfusion-free.spec.in @@ -27,7 +27,7 @@ Mock config files for the RPM Fusion Free Repository %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock -install -pm 0644 *.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock +install -pm 0644 etc/mock*.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock %clean diff --git a/mock-rpmfusion-nonfree.spec.in b/mock-rpmfusion-nonfree.spec.in index a41f6ee..87c518c 100644 --- a/mock-rpmfusion-nonfree.spec.in +++ b/mock-rpmfusion-nonfree.spec.in @@ -27,7 +27,7 @@ Mock config files for the RPM Fusion NonFree Repository %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock -install -pm 0644 *.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock +install -pm 0644 etc/mock/*.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock %clean diff --git a/round.sh b/round.sh index b661200..73e9d73 100755 --- a/round.sh +++ b/round.sh @@ -46,10 +46,13 @@ for arch in $ARCHES ; do sed -i -e "s|\$releasever|${fver}|g" fedora-${fver}-${arch}-${repo}.cfg if [ ! $arch == i386 -a ! $arch == x86_64 ] ; then if [ "$arch" == "armhfp" -a "${ffver}" -gt "19" ] ; then - continue + : + else + #echo sed it fedora-${fver}-${arch}-${repo}.cfg + sed -i -e "s|free/fedora/|free/fedora-secondary/|g" fedora-${fver}-${arch}-${repo}.cfg fi - sed -i -e "s|free/fedora/|free/fedora-secondary/|g" fedora-${fver}-${arch}-${repo}.cfg fi + mv fedora-${fver}-${arch}-${repo}.cfg etc/mock #sed -i -e "s|mirrorlist=http://mirrors.rpmfusion.org|#mirrorlist=http://mirrors.rpmfusion.org|g" fedora-${fver}-${arch2}-${repo}.cfg #sed -i -e "s|kojipkgs.fedoraproject.org|sparc.koji.fedoraproject.org|g" fedora-${fver}-${arch2}-${repo}.cfg #sed -i -e "s|#baseurl=http://download1.rpmfusion.org/nonfree/fedora/|baseurl=http://download1.rpmfusion.org/nonfree/fedora-secondary/|g" fedora-${fver}-${arch2}-${repo}.cfg -- 2.5.5