aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2017-05-21 16:44:05 -0400
committerB Stack <bgstack15@gmail.com>2017-05-21 16:44:05 -0400
commit3a3882b85d7a6bac3bf79d5e3f2365e500494be0 (patch)
treecdbabd88141a51b39a4849fed3c1ed4e13dda141
parentready for testing (diff)
downloadrbup-3a3882b85d7a6bac3bf79d5e3f2365e500494be0.tar.gz
rbup-3a3882b85d7a6bac3bf79d5e3f2365e500494be0.tar.bz2
rbup-3a3882b85d7a6bac3bf79d5e3f2365e500494be0.zip
corrected pack from its -core subpackage stuff
-rw-r--r--usr/share/rbup/docs/rbup.spec17
-rwxr-xr-xusr/share/rbup/inc/pack4
2 files changed, 18 insertions, 3 deletions
diff --git a/usr/share/rbup/docs/rbup.spec b/usr/share/rbup/docs/rbup.spec
index f561baf..5ee2540 100644
--- a/usr/share/rbup/docs/rbup.spec
+++ b/usr/share/rbup/docs/rbup.spec
@@ -38,6 +38,23 @@ exit 0
exit 0
%files
+%dir /etc/rbup
+%dir /usr/share/rbup
+%dir /usr/share/rbup/docs
+%dir /usr/share/rbup/examples
+%dir /usr/share/rbup/inc
+%config %attr(666, -, -) /etc/rbup/rbup.conf.2017-05-21.01
+%config %attr(666, -, -) /etc/rbup/rbup.conf
+%doc %attr(444, -, -) /usr/share/rbup/docs/files-for-versioning.txt
+/usr/share/rbup/docs/rbup.spec
+%doc %attr(444, -, -) /usr/share/rbup/docs/README.txt
+/usr/share/rbup/inc/pack
+/usr/share/rbup/inc/get-files
+/usr/share/rbup/rbup.sh
+/usr/share/rbup/rbup.sh.2017-05-21.01
+%verify(link) /usr/bin/rbup
+
+%files core
%changelog
* Sun May 21 2017 B Stack <bgstack15@gmail.com> 0.0-1
diff --git a/usr/share/rbup/inc/pack b/usr/share/rbup/inc/pack
index 4928237..6f81a63 100755
--- a/usr/share/rbup/inc/pack
+++ b/usr/share/rbup/inc/pack
@@ -54,18 +54,16 @@ case "${type}" in
########## PACKAGING for rhel/centos
# if you copy-paste this, be sure to define package, version, shortversion
rpmbuilddir=~/rpmbuild/
-sub1="core"
packagespecfile="${package}-${version}/usr/share/${package}/docs/${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"
-{ printf "\n%%files ${sub1}\n" ; "${rpmbuilddir}/SOURCES/${package}-${version}/usr/share/${package}/inc/get-files-${sub1}" 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"
-rm -rf "${package}.tgz"; tar -zc --exclude='.git' --exclude='README.md' -f "${package}.tgz" "${package}-${shortversion}"
+rm -rf "${package}.tgz"; tar -zc --exclude='.git*' --exclude='README.md' -f "${package}.tgz" "${package}-${shortversion}"
cp -p "${rpmbuilddir}/SOURCES/${packagespecfile}" "${rpmbuilddir}/SPECS"
mkdir -p "${rpmbuilddir}/RPMS/noarch"; cd "${rpmbuilddir}/RPMS/noarch"
rpmbuild -bb "${rpmbuilddir}/SPECS/${package}.spec"
bgstack15