From 8e79ea65a1f47c8fbb8a4c482296708befae7ed2 Mon Sep 17 00:00:00 2001
From: hexiujun <hexiujun1@huawei.com>
Date: Mon, 6 Jan 2020 14:41:26 +0800
Subject: [PATCH] update software package

---
 cdio_config.h              | 14 +-------------
 libcdio-no_date_footer.hml |  4 ----
 libcdio.spec               | 12 ++++++------
 3 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 libcdio-no_date_footer.hml

diff --git a/cdio_config.h b/cdio_config.h
index 9b01c00..0464833 100644
--- a/cdio_config.h
+++ b/cdio_config.h
@@ -4,7 +4,7 @@
  * identical.  Hence, this file is architecture-independent and calls
  * in an arch-dependent file that will appear in just one RPM.
  *
- * To avoid breaking arches not explicitly supported by Red Hat, we
+ * To avoid breaking arches not explicitly supported by openEuler, we
  * use this indirection file *only* on known multilib arches.
  *
  * Note: this may well fail if user tries to use gcc's -I- option.
@@ -14,16 +14,4 @@
 #include "cdio_config_x86_64.h"
 #elif defined(__i386__)
 #include "cdio_config_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "cdio_config_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "cdio_config_ppc.h"
-#elif defined(__s390x__)
-#include "cdio_config_s390x.h"
-#elif defined(__s390__)
-#include "cdio_config_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "cdio_config_sparc64.h"
-#elif defined(__sparc__)
-#include "cdio_config_sparc.h"
 #endif
diff --git a/libcdio-no_date_footer.hml b/libcdio-no_date_footer.hml
deleted file mode 100644
index 4886c65..0000000
--- a/libcdio-no_date_footer.hml
+++ /dev/null
@@ -1,4 +0,0 @@
-<hr size="1"><address style="text-align: right;"><small>
-Generated for $projectname by&nbsp;<a href="http://www.doxygen.org/
-index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
-$doxygenversion</small></address></body></html>
diff --git a/libcdio.spec b/libcdio.spec
index 64add6d..d44babc 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,13 +1,12 @@
 Name:            libcdio
 Version:         2.0.0
-Release:         6
+Release:         7
 Summary:         CD-ROM input and control library
 License:         GPLv3+
 URL:             http://www.gnu.org/software/libcdio/
 Source0:         https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz
 Source1:         https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz.sig
-Source2:         libcdio-no_date_footer.hml
-Source3:         cdio_config.h
+Source2:         cdio_config.h
 
 BuildRequires:   gcc gcc-c++ git pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
 Requires(post):  /sbin/ldconfig
@@ -37,17 +36,15 @@ iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS
 %make_build
 
 cd doc/doxygen
-sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = libcdio-no_date_footer.hml,g;" Doxyfile
 sed -i -e  "s,EXCLUDE .*$,EXCLUDE = ../../include/cdio/cdio_config.h,g;" Doxyfile
 
-cp %{SOURCE2} .
 ./run_doxygen
 
 %install
 %make_install
 if [ `uname -i` =  x86_64 ]; then
   mv $RPM_BUILD_ROOT%{_includedir}/cdio/cdio_config.h $RPM_BUILD_ROOT%{_includedir}/cdio/cdio_config_`uname -i`.h
-  install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/cdio
+  install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/cdio
 fi
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/*
@@ -99,6 +96,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Mon Jan 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.0-7
+- update software package
+
 * Sat Aug 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0.0-6
 - Type:bugfix
 - ID:NA
-- 
Gitee