!1 remove useless patch

Merge pull request !1 from chengquan/dev
This commit is contained in:
openeuler-ci-bot 2020-01-12 10:15:36 +08:00 committed by Gitee
commit 3a8ad24a63
2 changed files with 8 additions and 23 deletions

View File

@ -1,12 +0,0 @@
diff -up libmspack-0.4alpha/doc/Doxyfile.in.orig libmspack-0.4alpha/doc/Doxyfile.in
--- libmspack-0.4alpha/doc/Doxyfile.in.orig 2013-05-28 12:25:42.000000000 +0200
+++ libmspack-0.4alpha/doc/Doxyfile.in 2013-05-28 17:30:57.000000000 +0200
@@ -10,7 +10,7 @@ SHOW_USED_FILES = YES
INPUT = @top_srcdir@/mspack/mspack.h
FULL_PATH_NAMES = NO
GENERATE_HTML = YES
-HTML_OUTPUT = .
+HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_TIMESTAMP = NO
GENERATE_HTMLHELP = NO

View File

@ -1,13 +1,11 @@
Name: libmspack
Version: 0.7
Release: 0.1.5
Release: 0.1.6
Summary: Library for CAB and related files compression and decompression
License: LGPLv2.1
URL: http://www.cabextract.org.uk/libmspack/
Source0: https://github.com/kyz/libmspack/archive/v0.7alpha/%{name}-v0.7alpha.tar.gz
Patch0: %{name}-0.4alpha-doc.patch
Patch6000: CVE-2019-1010305.patch
Patch6001: CVE-2018-18585.patch
Patch6002: CVE-2018-18586.patch
@ -56,13 +54,6 @@ iconv -f ISO_8859-1 -t utf8 ChangeLog --output Changelog.utf8
touch -r ChangeLog Changelog.utf8
mv Changelog.utf8 ChangeLog
cd doc
doxygen
find html -type f | xargs touch -r %{SOURCE0}
rm -f html/installdox
cd ..
%files
%{_libdir}/%{name}.so.*
%{_bindir}/*
@ -76,9 +67,15 @@ cd ..
%files help
%doc README TODO ChangeLog AUTHORS
%doc doc/html
%doc doc
%changelog
* Thu Jan 9 2020 chengquan<chengquan3@huawei.com> - 0.7-0.1.6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove useless patch
* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.7-0.1.5
- Fix CVE-2018-18585 and CVE-2018-18586