From b2f8243d0ef9e230573448d2da1bc6246c66a2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=B3=E7=A2=A7=E6=B9=96=E7=9A=84=E7=A0=8D=E6=9F=B4?= =?UTF-8?q?=E4=BA=BA?= Date: Thu, 9 Jan 2020 14:43:02 +0800 Subject: [PATCH] remove useless patch --- libmspack-0.4alpha-doc.patch | 12 ------------ libmspack.spec | 19 ++++++++----------- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 libmspack-0.4alpha-doc.patch diff --git a/libmspack-0.4alpha-doc.patch b/libmspack-0.4alpha-doc.patch deleted file mode 100644 index 78396ec..0000000 --- a/libmspack-0.4alpha-doc.patch +++ /dev/null @@ -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 diff --git a/libmspack.spec b/libmspack.spec index 6fefff7..00a3821 100644 --- a/libmspack.spec +++ b/libmspack.spec @@ -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 - 0.7-0.1.6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove useless patch + * Sat Dec 21 2019 openEuler Buildteam - 0.7-0.1.5 - Fix CVE-2018-18585 and CVE-2018-18586 -- Gitee