[openjpeg] fix multilib bugs due to timestamps in generated doc files (#884827)
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 7 13:26:52 UTC 2012
commit 62f4d7e97f9bc07db509856d2792dd09b316cf57
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Dec 7 07:26:58 2012 -0600
fix multilib bugs due to timestamps in generated doc files (#884827)
Silly Doxyfile, set HTML_TIMESTAMP = NO by default
... and prep for future pkg iterations that include a
-devel-docs.noarch subpkg.
openjpeg-1.5.1-doxygen_timestamp.patch | 24 ++++++++++++++++++++++++
openjpeg.spec | 18 +++++++++++++-----
2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/openjpeg-1.5.1-doxygen_timestamp.patch b/openjpeg-1.5.1-doxygen_timestamp.patch
new file mode 100644
index 0000000..2f59999
--- /dev/null
+++ b/openjpeg-1.5.1-doxygen_timestamp.patch
@@ -0,0 +1,24 @@
+diff -up openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in.doxygen_timestamp openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in
+--- openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in.doxygen_timestamp 2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in 2012-12-06 15:23:35.079838524 -0600
+@@ -148,7 +148,7 @@ HTML_STYLESHEET =
+ HTML_COLORSTYLE_HUE = 220
+ HTML_COLORSTYLE_SAT = 100
+ HTML_COLORSTYLE_GAMMA = 80
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+ HTML_ALIGN_MEMBERS = YES
+ HTML_DYNAMIC_SECTIONS = NO
+ GENERATE_DOCSET = NO
+diff -up openjpeg-1.5.1/doc/Doxyfile.dox.doxygen_timestamp openjpeg-1.5.1/doc/Doxyfile.dox
+--- openjpeg-1.5.1/doc/Doxyfile.dox.doxygen_timestamp 2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/doc/Doxyfile.dox 2012-12-06 15:23:37.177813275 -0600
+@@ -147,7 +147,7 @@ HTML_STYLESHEET =
+ HTML_COLORSTYLE_HUE = 220
+ HTML_COLORSTYLE_SAT = 100
+ HTML_COLORSTYLE_GAMMA = 80
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+ HTML_ALIGN_MEMBERS = YES
+ HTML_DYNAMIC_SECTIONS = NO
+ GENERATE_DOCSET = NO
diff --git a/openjpeg.spec b/openjpeg.spec
index 6f4c5b9..0702b36 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -9,10 +9,9 @@
Name: openjpeg
Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JPEG 2000 command line tools
-Group: Applications/Multimedia
License: BSD
URL: http://code.google.com/p/openjpeg/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,20 +50,24 @@ compression standard from the Joint Photographic Experts Group (JPEG).
%package libs
Summary: JPEG 2000 codec runtime library
-Group: System Environment/Libraries
%description libs
The %{name}-libs package contains runtime libraries for applications that use
OpenJPEG.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use OpenJPEG.
+%package devel-docs
+Summary: Developer documentation for %{name}
+BuildArch: noarch
+%description devel-docs
+%{summary}.
+
%prep
%setup -q %{?runcheck:-a 1}
@@ -147,7 +150,6 @@ make test -C %{_target_platform}
%{_mandir}/man3/*libopenjpeg.3*
%files devel
-%doc %{?cmake_build:%{_target_platform}/}doc/html/
%{_includedir}/openjpeg-1.5/
# fedora-only compat symlink
%{_includedir}/openjpeg.h
@@ -158,8 +160,14 @@ make test -C %{_target_platform}
%{_libdir}/openjpeg-1.5/
%endif
+#files devel-docs
+%doc %{?cmake_build:%{_target_platform}/}doc/html/
+
%changelog
+* Thu Dec 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-2
+- fix multilib bugs due to timestamps in generated doc files (#884827)
+
* Thu Sep 13 2012 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-1
- 1.5.1
More information about the scm-commits
mailing list