From a45e496ab629980da19c2280c985474567bde688 Mon Sep 17 00:00:00 2001 From: He Rengui Date: Fri, 2 Apr 2021 11:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=84=9A=E6=9C=AC=E5=88=B0sh?= =?UTF-8?q?are/fastfds/bin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: He Rengui --- 0001-move_scripts_to_data_dir.patch | 32 ++++++++++++ fastdfs.spec | 75 +++++++++++++++++------------ 2 files changed, 77 insertions(+), 30 deletions(-) create mode 100644 0001-move_scripts_to_data_dir.patch diff --git a/0001-move_scripts_to_data_dir.patch b/0001-move_scripts_to_data_dir.patch new file mode 100644 index 0000000..f4f49c3 --- /dev/null +++ b/0001-move_scripts_to_data_dir.patch @@ -0,0 +1,32 @@ +From 0e4fbdbdbfbaccec47187e39632398ce32399be9 Mon Sep 17 00:00:00 2001 +From: herengui +Date: Fri, 2 Apr 2021 15:02:37 +0800 +Subject: [PATCH] 修改make.sh中复制scripts的逻辑，脚本文件放置到/usr/share/fastdfs/bin目录中， +直接放到/usr/bin目录中，文件名不能自解释脚本功能。 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + make.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/make.sh b/make.sh +index 69bb072..a1c1304 100755 +--- a/make.sh ++++ b/make.sh +@@ -156,8 +156,9 @@ cd .. + + if [ "$1" = "install" ]; then + cd .. +- cp -f restart.sh $TARGET_PREFIX/bin +- cp -f stop.sh $TARGET_PREFIX/bin ++ SHARE_BIN_DIR=$TARGET_PREFIX/share/fastdfs/bin ++ mkdir -p $SHARE_BIN_DIR ++ cp -f restart.sh stop.sh $SHARE_BIN_DIR + + if [ "$uname" = "Linux" ]; then + if [ "$WITH_LINUX_SERVICE" = "1" ]; then +-- +2.27.0 + diff --git a/fastdfs.spec b/fastdfs.spec index 03edeed..72735a5 100644 --- a/fastdfs.spec +++ b/fastdfs.spec @@ -1,13 +1,13 @@ Name: fastdfs Version: 6.06 -Release: 1 +Release: 2 Summary: FastDFS server and client License: GPL3.0 Group: Arch/Tech URL: https://github.com/happyfish100/fastdfs Source: https://github.com/happyfish100/fastdfs/archive/V%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: 0001-move_scripts_to_data_dir.patch Requires: gcc cmake BuildRequires: libfastcommon-devel >= 1.0.43 @@ -44,7 +44,7 @@ This package is client header of fastdfs client This package is tools for fastdfs %prep -%setup -q +%autosetup -p1 %build ./make.sh @@ -59,50 +59,65 @@ rm -f %{buildroot}/etc/fdfs/mime.types.sample /sbin/chkconfig --add fdfs_trackerd /sbin/chkconfig --add fdfs_storaged +create_symbolic_link() { + local source_file="%{_datadir}/%{name}/bin/$1" + local target_file="%{_bindir}/fdfs_$1" + test -f "${source_file}" && ln -sf "${source_file}" "${target_file}" +} + +create_symbolic_link "restart.sh" +create_symbolic_link "stop.sh" + %preun -n fastdfs-server /sbin/chkconfig --del fdfs_trackerd /sbin/chkconfig --del fdfs_storaged -%postun +%postun -n fastdfs-server +find %{_bindir} -maxdepth 1 -type l \ + -name "fdfs_restart.sh" -delete -o \ + -name "fdfs_stop.sh" -delete %clean rm -rf %{buildroot} %files -n fastdfs-server %defattr(-,root,root,-) -/usr/bin/fdfs_trackerd -/usr/bin/fdfs_storaged -/usr/bin/restart.sh -/usr/bin/stop.sh -/etc/init.d/* -/etc/fdfs/tracker.conf.sample -/etc/fdfs/storage.conf.sample -/etc/fdfs/storage_ids.conf.sample +%{_bindir}/fdfs_trackerd +%{_bindir}/fdfs_storaged +%{_datadir}/%{name}/bin/restart.sh +%{_datadir}/%{name}/bin/stop.sh +%{_sysconfdir}/init.d/* +%{_sysconfdir}/fdfs/tracker.conf.sample +%{_sysconfdir}/fdfs/storage.conf.sample +%{_sysconfdir}/fdfs/storage_ids.conf.sample %files -n libfdfsclient -/usr/lib64/libfdfsclient* -/usr/lib/libfdfsclient* -/etc/fdfs/client.conf.sample +%{_libdir}/libfdfsclient* +%{_usr}/lib/libfdfsclient* +%{_sysconfdir}/fdfs/client.conf.sample %files -n libfdfsclient-devel %defattr(-,root,root,-) -/usr/include/fastdfs/* +%{_includedir}/fastdfs/* %files -n fastdfs-tools -/usr/bin/fdfs_monitor -/usr/bin/fdfs_test -/usr/bin/fdfs_test1 -/usr/bin/fdfs_crc32 -/usr/bin/fdfs_upload_file -/usr/bin/fdfs_download_file -/usr/bin/fdfs_delete_file -/usr/bin/fdfs_file_info -/usr/bin/fdfs_appender_test -/usr/bin/fdfs_appender_test1 -/usr/bin/fdfs_append_file -/usr/bin/fdfs_upload_appender -/usr/bin/fdfs_regenerate_filename +%{_bindir}/fdfs_monitor +%{_bindir}/fdfs_test +%{_bindir}/fdfs_test1 +%{_bindir}/fdfs_crc32 +%{_bindir}/fdfs_upload_file +%{_bindir}/fdfs_download_file +%{_bindir}/fdfs_delete_file +%{_bindir}/fdfs_file_info +%{_bindir}/fdfs_appender_test +%{_bindir}/fdfs_appender_test1 +%{_bindir}/fdfs_append_file +%{_bindir}/fdfs_upload_appender +%{_bindir}/fdfs_regenerate_filename %changelog -* Fri Sep 11 2020 huyan90325 - 1.0.44-1 +* Fri Apr 02 2021 herengui - 6.06-2 +- Rearrange the files list + +* Fri Sep 11 2020 huyan90325 - 6.06-1 - Fastdfs package init -- Gitee