!2 amanda: Fixed build error
Merge pull request !2 from gnaygnil/master
This commit is contained in:
commit
1781d06070
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
|||||||
# amanda
|
|
||||||
|
|
||||||
#### Description
|
|
||||||
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
|
|
||||||
|
|
||||||
#### Software Architecture
|
|
||||||
Software architecture description
|
|
||||||
|
|
||||||
#### Installation
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### Instructions
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### Contribution
|
|
||||||
|
|
||||||
1. Fork the repository
|
|
||||||
2. Create Feat_xxx branch
|
|
||||||
3. Commit your code
|
|
||||||
4. Create Pull Request
|
|
||||||
|
|
||||||
|
|
||||||
#### Gitee Feature
|
|
||||||
|
|
||||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
|
||||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
|
||||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
|
||||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
|
||||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
|
||||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
|
||||||
39
README.md
39
README.md
@ -1,39 +0,0 @@
|
|||||||
# amanda
|
|
||||||
|
|
||||||
#### 介绍
|
|
||||||
{**以下是码云平台说明,您可以替换此简介**
|
|
||||||
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台
|
|
||||||
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
|
|
||||||
|
|
||||||
#### 软件架构
|
|
||||||
软件架构说明
|
|
||||||
|
|
||||||
|
|
||||||
#### 安装教程
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### 使用说明
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### 参与贡献
|
|
||||||
|
|
||||||
1. Fork 本仓库
|
|
||||||
2. 新建 Feat_xxx 分支
|
|
||||||
3. 提交代码
|
|
||||||
4. 新建 Pull Request
|
|
||||||
|
|
||||||
|
|
||||||
#### 码云特技
|
|
||||||
|
|
||||||
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
|
||||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
|
||||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
|
||||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
|
|
||||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
|
||||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
|
||||||
12
amanda.spec
12
amanda.spec
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Name: amanda
|
Name: amanda
|
||||||
Version: 3.5.1
|
Version: 3.5.1
|
||||||
Release: 17
|
Release: 18
|
||||||
Summary: A backup solution over network to disk
|
Summary: A backup solution over network to disk
|
||||||
License: BSD and GPLv3+ and GPLv2+ and GPLv2
|
License: BSD and GPLv3+ and GPLv2+ and GPLv2
|
||||||
URL: http://www.amanda.org
|
URL: http://www.amanda.org
|
||||||
@ -25,9 +25,9 @@ Source16: kamanda@.service
|
|||||||
|
|
||||||
Patch5: patch-tirpc
|
Patch5: patch-tirpc
|
||||||
|
|
||||||
BuildRequires: automake autoconf libtool dump xfsdump gnuplot cups
|
BuildRequires: automake autoconf libtool dump xfsdump cups
|
||||||
BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel
|
BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel
|
||||||
BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st
|
BuildRequires: krb5-devel openssh-clients ncompress mtx mt-st
|
||||||
BuildRequires: perl-devel perl-generators perl perl-Test-Simple
|
BuildRequires: perl-devel perl-generators perl perl-Test-Simple
|
||||||
BuildRequires: glib2-devel openssl-devel swig bison flex
|
BuildRequires: glib2-devel openssl-devel swig bison flex
|
||||||
BuildRequires: libcurl-devel procps-ng systemd
|
BuildRequires: libcurl-devel procps-ng systemd
|
||||||
@ -120,8 +120,6 @@ ln -s amrecover.8.gz %{buildroot}%{_mandir}/man8/amoldrecover.8
|
|||||||
|
|
||||||
pushd %{buildroot}
|
pushd %{buildroot}
|
||||||
mv .%{_localstatedir}/lib/amanda/example .%{_sysconfdir}/amanda/%defconfig
|
mv .%{_localstatedir}/lib/amanda/example .%{_sysconfdir}/amanda/%defconfig
|
||||||
cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
|
|
||||||
cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
|
|
||||||
rm -f .%{_sysconfdir}/amanda/%defconfig/xinetd*
|
rm -f .%{_sysconfdir}/amanda/%defconfig/xinetd*
|
||||||
rm -f .%{_sysconfdir}/amanda/%defconfig/inetd*
|
rm -f .%{_sysconfdir}/amanda/%defconfig/inetd*
|
||||||
mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists
|
mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists
|
||||||
@ -159,7 +157,6 @@ make check
|
|||||||
%dir %{_sysconfdir}/amanda/
|
%dir %{_sysconfdir}/amanda/
|
||||||
%{_sysconfdir}/amanda/amanda-security.conf
|
%{_sysconfdir}/amanda/amanda-security.conf
|
||||||
%config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
|
%config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
|
||||||
%config(noreplace) %{_sysconfdir}/amanda/crontab.sample
|
|
||||||
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/amanda-security.conf
|
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/amanda-security.conf
|
||||||
|
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
@ -196,5 +193,8 @@ make check
|
|||||||
%{_mandir}/man*
|
%{_mandir}/man*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 29 2020 Ling Yang <lingyang2@huawei.com> - 3.5.1-18
|
||||||
|
- Fixed build error
|
||||||
|
|
||||||
* Fri Feb 14 2020 gulining<gulining1@huawei.com> - 3.5.1-17
|
* Fri Feb 14 2020 gulining<gulining1@huawei.com> - 3.5.1-17
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user