diff --git a/0001-move_scripts_to_data_dir.patch b/0001-move_scripts_to_data_dir.patch deleted file mode 100644 index f4f49c3b19595cee19d838a470269c910ad9441e..0000000000000000000000000000000000000000 --- a/0001-move_scripts_to_data_dir.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/V6.06.tar.gz b/V6.06.tar.gz deleted file mode 100644 index c4a727d396bc10d4171a8d107332fb0c57f6609f..0000000000000000000000000000000000000000 Binary files a/V6.06.tar.gz and /dev/null differ diff --git a/V6.9.1.tar.gz b/V6.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..08d380d997346633de1af84c6a545edcd37b0cdb Binary files /dev/null and b/V6.9.1.tar.gz differ diff --git a/fastdfs.spec b/fastdfs.spec index e5a191d020d01e10afc3fe9857a712c7da6e6c22..d26a150de6af8c4ad6010f93126127a2c8a527c4 100644 --- a/fastdfs.spec +++ b/fastdfs.spec @@ -1,31 +1,34 @@ Name: fastdfs -Version: 6.06 -Release: 3 +Version: 6.9.1 +Release: 1 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 -Patch0: 0001-move_scripts_to_data_dir.patch - Requires: gcc cmake -BuildRequires: libfastcommon-devel >= 1.0.43 +BuildRequires: libfastcommon-devel >= 1.0.64 +BuildRequires: libserverframe-devel >= 1.1.23 BuildRequires: perl %description This package provides tracker & storage of fastdfs %package -n fastdfs-server -Requires: libfastcommon >= 1.0.43 +Requires: libfastcommon >= 1.0.64 +Requires: libserverframe >= 1.1.23 +Requires: fastdfs-config Summary: fastdfs tracker & storage %package -n fastdfs-tools -Requires: libfastcommon +Requires: libfdfsclient Summary: fastdfs tools %package -n libfdfsclient -Requires: libfastcommon +Requires: libfastcommon >= 1.0.64 +Requires: libserverframe >= 1.1.23 +Requires: fastdfs-config Summary: The client dynamic library of fastdfs %package -n libfdfsclient-devel @@ -41,67 +44,53 @@ This package is client dynamic library of fastdfs %description -n libfdfsclient-devel This package is client header of fastdfs client +%package -n fastdfs-config +Summary: FastDFS config files for sample + %description -n fastdfs-tools This package is tools for fastdfs +%description -n fastdfs-config +FastDFS config files for sample +commit version: $COMMIT_VERSION + %prep %autosetup -p1 %build -./make.sh +./make.sh clean && ./make.sh %install rm -rf %{buildroot} DESTDIR=$RPM_BUILD_ROOT ./make.sh install -rm -f %{buildroot}/etc/fdfs/http.conf.sample -rm -f %{buildroot}/etc/fdfs/mime.types.sample - -%post -n fastdfs-server -/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 +%post -%postun -n fastdfs-server -find %{_bindir} -maxdepth 1 -type l \ - -name "fdfs_restart.sh" -delete -o \ - -name "fdfs_stop.sh" -delete +%postun %clean rm -rf %{buildroot} +%files + %files -n fastdfs-server %defattr(-,root,root,-) %{_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 +%config(noreplace) /usr/lib/systemd/system/fdfs_trackerd.service +%config(noreplace) /usr/lib/systemd/system/fdfs_storaged.service %files -n libfdfsclient +%defattr(-,root,root,-) %{_libdir}/libfdfsclient* %{_usr}/lib/libfdfsclient* -%{_sysconfdir}/fdfs/client.conf.sample %files -n libfdfsclient-devel %defattr(-,root,root,-) %{_includedir}/fastdfs/* %files -n fastdfs-tools +%defattr(-,root,root,-) %{_bindir}/fdfs_monitor %{_bindir}/fdfs_test %{_bindir}/fdfs_test1 @@ -116,7 +105,14 @@ rm -rf %{buildroot} %{_bindir}/fdfs_upload_appender %{_bindir}/fdfs_regenerate_filename +%files -n fastdfs-config +%defattr(-,root,root,-) +%config(noreplace) /etc/fdfs/*.conf + %changelog +* Fri Dec 16 2022 lihaoxiang - 6.9.1-1 +- Upgrade to version 6.9.1 + * Thu Jun 23 2022 lihaoxiang - 6.06-3 - Modified fastdfs.spec that add BuildRequires about perl