From 8809b924987d0da9aa1f0dbf362b463958cbfbcf Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Sat, 16 Sep 2023 13:23:43 +0800
Subject: [PATCH] build

---
 .../etc/nginx/conf.d/omc.conf                 |   0
 .../lib/lib64/libwireshark.so.15.0.12         | Bin
 .../lib/lib64/libwiretap.so.12.0.12           | Bin
 .../lib/lib64/libwsutil.so.13.1.0             | Bin
 rpmbuild/BUILD/{ => lib}/systemd/adb.service  |   0
 .../{BUILDROOT => BUILD}/usr/local/bin/tshark | Bin
 .../local}/db/bin/conf/default/redis.conf     |   0
 .../BUILD/{ => usr/local}/db/bin/redis-cli    | Bin
 .../BUILD/{ => usr/local}/db/bin/redis-server | Bin
 .../BUILD/{ => usr/local}/db/log/.gitkeep     |   0
 .../usr/local/omc/.ssh/id_rsa                 |   0
 .../usr/local/omc/.ssh/id_rsa.pub             |   0
 .../usr/local/omc/.ssh/private_key.pem        |   0
 rpmbuild/BUILDROOT/.gitkeep                   |   0
 rpmbuild/SPECS/omc.spec                       |  41 +++++++++---------
 15 files changed, 21 insertions(+), 20 deletions(-)
 rename rpmbuild/{BUILDROOT => BUILD}/etc/nginx/conf.d/omc.conf (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/lib/lib64/libwireshark.so.15.0.12 (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/lib/lib64/libwiretap.so.12.0.12 (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/lib/lib64/libwsutil.so.13.1.0 (100%)
 rename rpmbuild/BUILD/{ => lib}/systemd/adb.service (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/usr/local/bin/tshark (100%)
 rename rpmbuild/BUILD/{ => usr/local}/db/bin/conf/default/redis.conf (100%)
 rename rpmbuild/BUILD/{ => usr/local}/db/bin/redis-cli (100%)
 rename rpmbuild/BUILD/{ => usr/local}/db/bin/redis-server (100%)
 rename rpmbuild/BUILD/{ => usr/local}/db/log/.gitkeep (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/usr/local/omc/.ssh/id_rsa (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/usr/local/omc/.ssh/id_rsa.pub (100%)
 rename rpmbuild/{BUILDROOT => BUILD}/usr/local/omc/.ssh/private_key.pem (100%)
 create mode 100644 rpmbuild/BUILDROOT/.gitkeep

diff --git a/rpmbuild/BUILDROOT/etc/nginx/conf.d/omc.conf b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf
similarity index 100%
rename from rpmbuild/BUILDROOT/etc/nginx/conf.d/omc.conf
rename to rpmbuild/BUILD/etc/nginx/conf.d/omc.conf
diff --git a/rpmbuild/BUILDROOT/lib/lib64/libwireshark.so.15.0.12 b/rpmbuild/BUILD/lib/lib64/libwireshark.so.15.0.12
similarity index 100%
rename from rpmbuild/BUILDROOT/lib/lib64/libwireshark.so.15.0.12
rename to rpmbuild/BUILD/lib/lib64/libwireshark.so.15.0.12
diff --git a/rpmbuild/BUILDROOT/lib/lib64/libwiretap.so.12.0.12 b/rpmbuild/BUILD/lib/lib64/libwiretap.so.12.0.12
similarity index 100%
rename from rpmbuild/BUILDROOT/lib/lib64/libwiretap.so.12.0.12
rename to rpmbuild/BUILD/lib/lib64/libwiretap.so.12.0.12
diff --git a/rpmbuild/BUILDROOT/lib/lib64/libwsutil.so.13.1.0 b/rpmbuild/BUILD/lib/lib64/libwsutil.so.13.1.0
similarity index 100%
rename from rpmbuild/BUILDROOT/lib/lib64/libwsutil.so.13.1.0
rename to rpmbuild/BUILD/lib/lib64/libwsutil.so.13.1.0
diff --git a/rpmbuild/BUILD/systemd/adb.service b/rpmbuild/BUILD/lib/systemd/adb.service
similarity index 100%
rename from rpmbuild/BUILD/systemd/adb.service
rename to rpmbuild/BUILD/lib/systemd/adb.service
diff --git a/rpmbuild/BUILDROOT/usr/local/bin/tshark b/rpmbuild/BUILD/usr/local/bin/tshark
similarity index 100%
rename from rpmbuild/BUILDROOT/usr/local/bin/tshark
rename to rpmbuild/BUILD/usr/local/bin/tshark
diff --git a/rpmbuild/BUILD/db/bin/conf/default/redis.conf b/rpmbuild/BUILD/usr/local/db/bin/conf/default/redis.conf
similarity index 100%
rename from rpmbuild/BUILD/db/bin/conf/default/redis.conf
rename to rpmbuild/BUILD/usr/local/db/bin/conf/default/redis.conf
diff --git a/rpmbuild/BUILD/db/bin/redis-cli b/rpmbuild/BUILD/usr/local/db/bin/redis-cli
similarity index 100%
rename from rpmbuild/BUILD/db/bin/redis-cli
rename to rpmbuild/BUILD/usr/local/db/bin/redis-cli
diff --git a/rpmbuild/BUILD/db/bin/redis-server b/rpmbuild/BUILD/usr/local/db/bin/redis-server
similarity index 100%
rename from rpmbuild/BUILD/db/bin/redis-server
rename to rpmbuild/BUILD/usr/local/db/bin/redis-server
diff --git a/rpmbuild/BUILD/db/log/.gitkeep b/rpmbuild/BUILD/usr/local/db/log/.gitkeep
similarity index 100%
rename from rpmbuild/BUILD/db/log/.gitkeep
rename to rpmbuild/BUILD/usr/local/db/log/.gitkeep
diff --git a/rpmbuild/BUILDROOT/usr/local/omc/.ssh/id_rsa b/rpmbuild/BUILD/usr/local/omc/.ssh/id_rsa
similarity index 100%
rename from rpmbuild/BUILDROOT/usr/local/omc/.ssh/id_rsa
rename to rpmbuild/BUILD/usr/local/omc/.ssh/id_rsa
diff --git a/rpmbuild/BUILDROOT/usr/local/omc/.ssh/id_rsa.pub b/rpmbuild/BUILD/usr/local/omc/.ssh/id_rsa.pub
similarity index 100%
rename from rpmbuild/BUILDROOT/usr/local/omc/.ssh/id_rsa.pub
rename to rpmbuild/BUILD/usr/local/omc/.ssh/id_rsa.pub
diff --git a/rpmbuild/BUILDROOT/usr/local/omc/.ssh/private_key.pem b/rpmbuild/BUILD/usr/local/omc/.ssh/private_key.pem
similarity index 100%
rename from rpmbuild/BUILDROOT/usr/local/omc/.ssh/private_key.pem
rename to rpmbuild/BUILD/usr/local/omc/.ssh/private_key.pem
diff --git a/rpmbuild/BUILDROOT/.gitkeep b/rpmbuild/BUILDROOT/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index 7d8b375..4bff772 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -27,26 +27,27 @@ mkdir -p usr/local/db/
 mkdir -p etc/nginx/conf.d
 mkdir -p lib/systemd/system/
 
-cd ${RPM_BUILD_DIR}
-cp -rf omc/.ssh ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/mmllog ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/mmlhome ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/bin ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/etc ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/htdocs ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/log ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/backup ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/upload ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/software ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/license ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf omc/database ${RPM_BUILD_ROOT}/usr/local/omc/
-cp -rf db/* ${RPM_BUILD_ROOT}/usr/local/db/
-cp -f nginx/omc.conf ${RPM_BUILD_ROOT}/etc/nginx/conf.d/
-cp -f systemd/restagent.service ${RPM_BUILD_ROOT}/lib/systemd/system/restagent.service
-cp -f systemd/crontask.service ${RPM_BUILD_ROOT}/lib/systemd/system/crontask.service
-cp -f systemd/sshsvc.service ${RPM_BUILD_ROOT}/lib/systemd/system/sshsvc.service
-cp -f systemd/captrace.service ${RPM_BUILD_ROOT}/lib/systemd/system/captrace.service
-cp -f systemd/adb.service ${RPM_BUILD_ROOT}/lib/systemd/system/adb.service
+#cd ${RPM_BUILD_DIR}
+cp -rf ${RPM_BUILD_DIR}/* ${RPM_BUILD_ROOT}/
+#cp -rf omc/.ssh ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/mmllog ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/mmlhome ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/bin ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/etc ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/htdocs ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/log ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/backup ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/upload ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/software ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/license ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf omc/database ${RPM_BUILD_ROOT}/usr/local/omc/
+#cp -rf db/* ${RPM_BUILD_ROOT}/usr/local/db/
+#cp -f nginx/omc.conf ${RPM_BUILD_ROOT}/etc/nginx/conf.d/
+#cp -f systemd/restagent.service ${RPM_BUILD_ROOT}/lib/systemd/system/restagent.service
+#cp -f systemd/crontask.service ${RPM_BUILD_ROOT}/lib/systemd/system/crontask.service
+#cp -f systemd/sshsvc.service ${RPM_BUILD_ROOT}/lib/systemd/system/sshsvc.service
+#cp -f systemd/captrace.service ${RPM_BUILD_ROOT}/lib/systemd/system/captrace.service
+#cp -f systemd/adb.service ${RPM_BUILD_ROOT}/lib/systemd/system/adb.service
 
 %build
 #cd %{buildroot}/..