From 109659dda35f5413d171ade19eadd722c19eaa84 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 22 Jul 2017 13:41:26 -0400 Subject: fixed pack calling get-files --- usr/share/mirror/build/mirror.spec | 76 +++++++++++++++++++------------------- usr/share/mirror/build/pack | 2 +- 2 files changed, 40 insertions(+), 38 deletions(-) (limited to 'usr/share') diff --git a/usr/share/mirror/build/mirror.spec b/usr/share/mirror/build/mirror.spec index 4cdd7ee..f4eb24f 100644 --- a/usr/share/mirror/build/mirror.spec +++ b/usr/share/mirror/build/mirror.spec @@ -36,62 +36,64 @@ rm -rf ${buildroot} %files %dir /etc/mirror %dir /usr/share/mirror +%dir /usr/share/mirror/build +%dir /usr/share/mirror/inc %dir /usr/share/mirror/examples -%dir /usr/share/mirror/examples/sites -%dir /usr/share/mirror/examples/deb %dir /usr/share/mirror/examples/rpm -%dir /usr/share/mirror/inc -%dir /usr/share/mirror/docs +%dir /usr/share/mirror/examples/deb +%dir /usr/share/mirror/examples/sites %dir /usr/share/mirror/scripts -%config /etc/sudoers.d/50_mirror-sudo %config /etc/cron.d/mirror.cron -%config /etc/httpd/conf.d/local_mirror.conf -/etc/httpd/conf.d/local_mirror-ssl.cnf %config /etc/mirror/mirror.conf %config /etc/mirror/deploy.conf -/usr/share/httpd/icons/rpm.png -/usr/share/httpd/icons/repo.png -/usr/share/httpd/icons/deb.png +%config /etc/httpd/conf.d/local_mirror.conf +/etc/httpd/conf.d/local_mirror-ssl.cnf +%config /etc/sudoers.d/50_mirror-sudo +%verify(link) /usr/local/bin/deploy +%doc %attr(444, -, -) /usr/share/mirror/build/files-for-versioning.txt +/usr/share/mirror/build/get-files-core +/usr/share/mirror/build/localize_git.sh +/usr/share/mirror/build/get-files +%doc %attr(444, -, -) /usr/share/mirror/build/scrub.txt +/usr/share/mirror/build/mirror.spec +/usr/share/mirror/build/pack +/usr/share/mirror/inc/rsync +/usr/share/mirror/mirror-master.sh +/usr/share/mirror/doc /usr/share/mirror/examples/FOOTER.html +/usr/share/mirror/examples/HEADER.html /usr/share/mirror/examples/favicon.png -%config /usr/share/mirror/examples/sites/zz_proxy.conf +/usr/share/mirror/examples/rpm/FOOTER.html +/usr/share/mirror/examples/rpm/HEADER.html +/usr/share/mirror/examples/rpm/smith122rpm.repo +/usr/share/mirror/examples/rpm/update-smith122rpm.sh /usr/share/mirror/examples/favicon.ico -/usr/share/mirror/examples/HEADER.html /usr/share/mirror/examples/deb/FOOTER.html +/usr/share/mirror/examples/deb/smith122deb.gpg /usr/share/mirror/examples/deb/smith122deb.list /usr/share/mirror/examples/deb/HEADER.html -/usr/share/mirror/examples/deb/smith122deb.gpg /usr/share/mirror/examples/deb/update-smith122deb.sh -/usr/share/mirror/examples/rpm/FOOTER.html -/usr/share/mirror/examples/rpm/HEADER.html -/usr/share/mirror/examples/rpm/smith122rpm.repo -/usr/share/mirror/examples/rpm/update-smith122rpm.sh -/usr/share/mirror/inc/get-files -/usr/share/mirror/inc/get-files-core -/usr/share/mirror/inc/rsync -/usr/share/mirror/inc/localize_git.sh -%doc %attr(444, -, -) /usr/share/mirror/inc/scrub.txt -/usr/share/mirror/inc/pack -%doc %attr(444, -, -) /usr/share/mirror/docs/files-for-versioning.txt -%doc %attr(444, -, -) /usr/share/mirror/docs/packaging.txt -/usr/share/mirror/docs/mirror.spec -%doc %attr(444, -, -) /usr/share/mirror/docs/README.txt -/usr/share/mirror/mirror-master.sh -%config /usr/share/mirror/scripts/fedora-updates -%config /usr/share/mirror/scripts/libreoffice -%config /usr/share/mirror/scripts/ubuntu-releases -%config /usr/share/mirror/scripts/putty +%config /usr/share/mirror/examples/sites/zz_proxy.conf %config /usr/share/mirror/scripts/ssh -%config /usr/share/mirror/scripts/ubuntu -%config /usr/share/mirror/scripts/fedora-releases +%config /usr/share/mirror/scripts/fedora-updates %config /usr/share/mirror/scripts/centos +%config /usr/share/mirror/scripts/rsyslog +%config /usr/share/mirror/scripts/ubuntu %config /usr/share/mirror/scripts/old-scripts.tgz +%config /usr/share/mirror/scripts/linuxmint-repos %config /usr/share/mirror/scripts/fedora-epel +%config /usr/share/mirror/scripts/fedora-releases +%config /usr/share/mirror/scripts/libreoffice +%config /usr/share/mirror/scripts/ubuntu-releases +%config /usr/share/mirror/scripts/putty %config /usr/share/mirror/scripts/linuxmint-isos -%config /usr/share/mirror/scripts/rsyslog -%config /usr/share/mirror/scripts/linuxmint-repos /usr/share/mirror/deploy.sh -%verify(link) /usr/local/bin/deploy +%doc %attr(444, -, -) /usr/share/doc/mirror/README.txt +%doc %attr(444, -, -) /usr/share/doc/mirror/packaging.txt +%doc %attr(444, -, -) /usr/share/doc/mirror/version.txt +/usr/share/httpd/icons/rpm.png +/usr/share/httpd/icons/deb.png +/usr/share/httpd/icons/repo.png %changelog * Sat Jul 22 2017 B Stack 1.1-5 diff --git a/usr/share/mirror/build/pack b/usr/share/mirror/build/pack index 6364137..e16db5a 100755 --- a/usr/share/mirror/build/pack +++ b/usr/share/mirror/build/pack @@ -53,7 +53,7 @@ rpmbuilddir=~/rpmbuild/ packagespecfile="${package}-${version}/usr/share/${package}/build/${package}.spec" sed -n -e '1,/^\%files$/p;' "${rpmbuilddir}/SOURCES/${packagespecfile}" > "${rpmbuilddir}/SOURCES/${packagespecfile}.$$.swp" # removes files and changelog cd "${rpmbuilddir}/SOURCES/${package}-${version}" -"${rpmbuilddir}/SOURCES/${package}-${version}/usr/share/${package}/inc/get-files" rpm >> "${rpmbuilddir}/SOURCES/${packagespecfile}.$$.swp" +"${rpmbuilddir}/SOURCES/${package}-${version}/usr/share/${package}/build/get-files" rpm >> "${rpmbuilddir}/SOURCES/${packagespecfile}.$$.swp" { printf '\n'; sed -n -e '/^\%changelog/,$p' "${rpmbuilddir}/SOURCES/${packagespecfile}"; } >> "${rpmbuilddir}/SOURCES/${packagespecfile}.$$.swp" mv -f "${rpmbuilddir}/SOURCES/${packagespecfile}.$$.swp" "${rpmbuilddir}/SOURCES/${packagespecfile}" rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}"; cp -prf "${rpmbuilddir}/SOURCES/${package}-${version}" "${rpmbuilddir}/SOURCES/${package}-${shortversion}" -- cgit