diff options
| -rw-r--r-- | usr/share/mirror/build/mirror.spec | 5 | ||||
| -rwxr-xr-x | usr/share/mirror/build/pack | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/usr/share/mirror/build/mirror.spec b/usr/share/mirror/build/mirror.spec index 3bbccbc..4cdd7ee 100644 --- a/usr/share/mirror/build/mirror.spec +++ b/usr/share/mirror/build/mirror.spec @@ -92,3 +92,8 @@ rm -rf ${buildroot} %config /usr/share/mirror/scripts/linuxmint-repos /usr/share/mirror/deploy.sh %verify(link) /usr/local/bin/deploy + +%changelog +* Sat Jul 22 2017 B Stack <bgstack15@gmail.com> 1.1-5 +- Rearranged directory structure to match current bgscripts standard. +- Updated content. See doc/README.txt. diff --git a/usr/share/mirror/build/pack b/usr/share/mirror/build/pack index 3b3ca84..6364137 100755 --- a/usr/share/mirror/build/pack +++ b/usr/share/mirror/build/pack @@ -51,9 +51,11 @@ case "${type}" in # if you copy-paste this, be sure to define package, version, shortversion rpmbuilddir=~/rpmbuild/ packagespecfile="${package}-${version}/usr/share/${package}/build/${package}.spec" -sed -i -n '1,/^\%files$/p;' "${rpmbuilddir}/SOURCES/${packagespecfile}" +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}" +"${rpmbuilddir}/SOURCES/${package}-${version}/usr/share/${package}/inc/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}" rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}/DEBIAN" cd "${rpmbuilddir}/SOURCES" |