diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/share/ddtools/build/ddtools.spec | 13 | ||||
| -rwxr-xr-x | usr/share/ddtools/build/pack | 9 |
2 files changed, 4 insertions, 18 deletions
diff --git a/usr/share/ddtools/build/ddtools.spec b/usr/share/ddtools/build/ddtools.spec index b4aa82f..0c8de2d 100644 --- a/usr/share/ddtools/build/ddtools.spec +++ b/usr/share/ddtools/build/ddtools.spec @@ -40,19 +40,6 @@ exit 0 exit 0 %files -%dir /etc/ddtools -%dir /usr/share/ddtools -/etc/sysconfig/dhcpd-control -/usr/share/ddtools/inc/get-files -/usr/share/ddtools/inc/pack -%config %attr(666, -, -) /usr/share/ddtools/examples/ipa.smith122.com.conf.example -%doc %attr(444, -, -) /usr/share/ddtools/docs/files-for-versioning.txt -%doc %attr(444, -, -) /usr/share/ddtools/docs/README.txt -/usr/share/ddtools/docs/ddtools.spec -/usr/share/ddtools/updatezone.sh -/usr/share/ddtools/dhcpd-control.sh -%verify(link) /usr/bin/updatezone -%verify(link) /usr/bin/dhcpd-control %changelog * Sat Oct 14 2017 B Stack <bgstack15@gmail.com> 0.0-3 diff --git a/usr/share/ddtools/build/pack b/usr/share/ddtools/build/pack index 5173a22..c8ebd6c 100755 --- a/usr/share/ddtools/build/pack +++ b/usr/share/ddtools/build/pack @@ -51,10 +51,10 @@ case "${type}" in ########## PACKAGING for rhel/centos # if you copy-paste this, be sure to define package, version, shortversion rpmbuilddir=~/rpmbuild/ -packagespecfile="${package}-${version}/usr/share/${package}/docs/${package}.spec" +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}" @@ -73,10 +73,9 @@ rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}/" "${rpmbuilddir}/SOUR # You need package dpkg-dev to build packages. # if you copy-paste this, be sure to define package, version debdir=~/deb -debiandirmain="${package}-${version}/usr/share/${package}/docs/debian-${package}" +debiandirmain="${package}-${version}/usr/share/${package}/build/debian-${package}" cd "${debdir}/${package}-${version}" -"${debdir}/${package}-${version}/usr/share/${package}/inc/get-files" deb | xargs md5sum > "${debdir}/${debiandirmain}/md5sums" -#mkdir -p "${debdir}/$$"; mv "${debdir}/${package}-${version}/.git" "${debdir}/${package}-${version}/README.md" "${debdir}/$$/" +"${debdir}/${package}-${version}/usr/share/${package}/build/get-files" deb | xargs md5sum > "${debdir}/${debiandirmain}/md5sums" cd "${debdir}" # main |