starting to fix to use build/ dir

12 files changed, 9 insertions, 5 deletions

diff --git a/usr/share/mirror/docs/README.txt b/usr/share/doc/mirror/README.txt
index 404ccec..404ccec 100644
--- a/usr/share/mirror/docs/README.txt
+++ b/usr/share/doc/mirror/README.txt
diff --git a/usr/share/mirror/docs/packaging.txt b/usr/share/doc/mirror/packaging.txt
index a97d4c5..a97d4c5 100644
--- a/usr/share/mirror/docs/packaging.txt
+++ b/usr/share/doc/mirror/packaging.txt
diff --git a/usr/share/doc/mirror/version.txt b/usr/share/doc/mirror/version.txt
new file mode 100644
index 0000000..c183539
--- /dev/null
+++ b/usr/share/doc/mirror/version.txt
@@ -0,0 +1 @@
+1.1-5
diff --git a/usr/share/mirror/build/files-for-versioning.txt b/usr/share/mirror/build/files-for-versioning.txt
new file mode 100644
index 0000000..e15dd5b
--- /dev/null
+++ b/usr/share/mirror/build/files-for-versioning.txt
@@ -0,0 +1,5 @@
+doc/README.txt
+doc/version.txt
+build/mirror.spec
+build/localize_git.sh
+build/scrub.txt
diff --git a/usr/share/mirror/inc/get-files b/usr/share/mirror/build/get-files
index 8ad528b..689c186 100755
--- a/usr/share/mirror/inc/get-files
+++ b/usr/share/mirror/build/get-files
@@ -2,6 +2,7 @@
 # File: get-files
 case "${1}" in
    rpm)
+if test -n "${package}"; then cd ${rpmbuilddir}/SOURCES/"${package}-${version}"; else cd $( pwd | sed -r -e 's/(SOURCES\/[^\/]+\/).*/\1/;' ); fi
 
 ### for rpm
 find * -type d \
diff --git a/usr/share/mirror/inc/get-files-core b/usr/share/mirror/build/get-files-core
index a3feb42..a3feb42 100755
--- a/usr/share/mirror/inc/get-files-core
+++ b/usr/share/mirror/build/get-files-core
diff --git a/usr/share/mirror/inc/localize_git.sh b/usr/share/mirror/build/localize_git.sh
index dd582c8..dd582c8 100755
--- a/usr/share/mirror/inc/localize_git.sh
+++ b/usr/share/mirror/build/localize_git.sh
diff --git a/usr/share/mirror/docs/mirror.spec b/usr/share/mirror/build/mirror.spec
index 3bbccbc..3bbccbc 100644
--- a/usr/share/mirror/docs/mirror.spec
+++ b/usr/share/mirror/build/mirror.spec
diff --git a/usr/share/mirror/inc/pack b/usr/share/mirror/build/pack
index 7bbde31..3b3ca84 100755
--- a/usr/share/mirror/inc/pack
+++ b/usr/share/mirror/build/pack
@@ -50,7 +50,7 @@ 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 -i -n '1,/^\%files$/p;' "${rpmbuilddir}/SOURCES/${packagespecfile}"
 cd "${rpmbuilddir}/SOURCES/${package}-${version}"
 "${rpmbuilddir}/SOURCES/${package}-${version}/usr/share/${package}/inc/get-files" rpm >> "${rpmbuilddir}/SOURCES/${packagespecfile}"
diff --git a/usr/share/mirror/inc/scrub.txt b/usr/share/mirror/build/scrub.txt
index dbf567a..dbf567a 100644
--- a/usr/share/mirror/inc/scrub.txt
+++ b/usr/share/mirror/build/scrub.txt
diff --git a/usr/share/mirror/doc b/usr/share/mirror/doc
new file mode 120000
index 0000000..423db9d
--- /dev/null
+++ b/usr/share/mirror/doc
@@ -0,0 +1 @@
+../doc/mirror
\ No newline at end of file
diff --git a/usr/share/mirror/docs/files-for-versioning.txt b/usr/share/mirror/docs/files-for-versioning.txt
deleted file mode 100644
index e7f7a9e..0000000
--- a/usr/share/mirror/docs/files-for-versioning.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-inc/localize_git.sh
-inc/scrub.txt
-docs/README.txt
-docs/mirror.spec