From 235fabae3d9b13acff02846ad48a5a1850d66d51 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 18 2021 07:01:56 +0000 Subject: import lensfun-0.3.2-15.el8 --- diff --git a/SOURCES/lensfun-0.3.2-HTML_TIMESTAMP_NO.patch b/SOURCES/lensfun-0.3.2-HTML_TIMESTAMP_NO.patch new file mode 100644 index 0000000..fd2d021 --- /dev/null +++ b/SOURCES/lensfun-0.3.2-HTML_TIMESTAMP_NO.patch @@ -0,0 +1,13 @@ +diff --git a/docs/doxyfile.in.cmake b/docs/doxyfile.in.cmake +index 235484b..c8791b9 100644 +--- a/docs/doxyfile.in.cmake ++++ b/docs/doxyfile.in.cmake +@@ -958,7 +958,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # page will contain the date and time when the page was generated. Setting + # this to NO can help when comparing the output of multiple runs. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the diff --git a/SPECS/lensfun.spec b/SPECS/lensfun.spec index 0595d7e..93357c0 100644 --- a/SPECS/lensfun.spec +++ b/SPECS/lensfun.spec @@ -9,7 +9,7 @@ Name: lensfun Version: 0.3.2 Summary: Library to rectify defects introduced by photographic lenses -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv3 and CC-BY-SA URL: http://lensfun.sourceforge.net/ @@ -29,6 +29,7 @@ Patch866: 0866-Pull-isnan-into-std-namespace-include-cmath-not-math.patch ## upstreamable patches # install manpages only when INSTALL_HELPER_SCRIPTS=ON Patch200: lensfun-0.3.2-INSTALL_HELPER_SCRIPTS.patch +Patch201: lensfun-0.3.2-HTML_TIMESTAMP_NO.patch BuildRequires: cmake >= 2.8 BuildRequires: doxygen @@ -39,7 +40,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: %{python3} %{python3}-devel %else Obsoletes: lensfun-python3 < %{version}-%{release} -#Obsoletes: lensfun-python34 < %{version}-%{release} +#Obsoletes: lensfun-python34 < %%{version}-%%{release} Obsoletes: lensfun-tools < %{version}-%{release} %endif # for rst2man, if INSTALL_HELPER_SCRIPTS != OFF @@ -93,6 +94,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %patch866 -p1 -b .0866 %patch200 -p1 -b .INSTALL_HELPER_SCRIPTS +%patch201 -p1 -b .HTML_TIMESTAMP_NO %if 0%{?python3:1} sed -i.shbang \ @@ -172,6 +174,10 @@ popd %changelog +* Thu Jan 14 2021 Jiri Kucera - 0.3.2-15 +- Fix undeclared file conflicts + Resolves: #1853149 + * Sun Jul 22 2018 Charalampos Stratakis - 0.3.2-14 - Change build dependency to python3-docutils