Merge Doxygen patch from f19 branch to avoid regressions
This commit is contained in:
parent
700b77dbc7
commit
235afa51fe
82
0003-DOXY-Don-t-generate-timestamp.patch
Normal file
82
0003-DOXY-Don-t-generate-timestamp.patch
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
From 723ce0cd957d2b17618ca9698bcc66e61b9b6110 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ondrej Kos <okos@redhat.com>
|
||||||
|
Date: Fri, 12 Jul 2013 14:05:23 +0200
|
||||||
|
Subject: [PATCH 1/2] DOXY: Don't generate timestamp
|
||||||
|
|
||||||
|
https://fedorahosted.org/sssd/ticket/2003
|
||||||
|
---
|
||||||
|
basicobjects/basicobjects.cfg.doxy.in | 2 +-
|
||||||
|
collection/collection.cfg.doxy.in | 2 +-
|
||||||
|
ini/ini_config.cfg.doxy.in | 2 +-
|
||||||
|
path_utils/path_utils.cfg.doxy.in | 2 +-
|
||||||
|
refarray/ref_array.cfg.doxy.in | 2 +-
|
||||||
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/basicobjects/basicobjects.cfg.doxy.in b/basicobjects/basicobjects.cfg.doxy.in
|
||||||
|
index fed0cfbe1256c3ffcd9010d7de34babe3d266de4..f70e19c00a4e7c11c178b3c1281a00694158157a 100644
|
||||||
|
--- a/basicobjects/basicobjects.cfg.doxy.in
|
||||||
|
+++ b/basicobjects/basicobjects.cfg.doxy.in
|
||||||
|
@@ -810,7 +810,7 @@ HTML_STYLESHEET =
|
||||||
|
# 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_ALIGN_MEMBERS tag is set to YES, the members of classes,
|
||||||
|
# files or namespaces will be aligned in HTML using tables. If set to
|
||||||
|
diff --git a/collection/collection.cfg.doxy.in b/collection/collection.cfg.doxy.in
|
||||||
|
index 77e42df81f4dd7159798816d75312f2993f5447a..ec134e88cb019543e461ff0131b6cd1b7eed6a87 100644
|
||||||
|
--- a/collection/collection.cfg.doxy.in
|
||||||
|
+++ b/collection/collection.cfg.doxy.in
|
||||||
|
@@ -810,7 +810,7 @@ HTML_STYLESHEET =
|
||||||
|
# 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_ALIGN_MEMBERS tag is set to YES, the members of classes,
|
||||||
|
# files or namespaces will be aligned in HTML using tables. If set to
|
||||||
|
diff --git a/ini/ini_config.cfg.doxy.in b/ini/ini_config.cfg.doxy.in
|
||||||
|
index ee87fa77aa69b4df9e48aa92c75dbf07429e793b..f92dbdecdbbfab86f38eb419062110d737b1b538 100644
|
||||||
|
--- a/ini/ini_config.cfg.doxy.in
|
||||||
|
+++ b/ini/ini_config.cfg.doxy.in
|
||||||
|
@@ -810,7 +810,7 @@ HTML_STYLESHEET =
|
||||||
|
# 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_ALIGN_MEMBERS tag is set to YES, the members of classes,
|
||||||
|
# files or namespaces will be aligned in HTML using tables. If set to
|
||||||
|
diff --git a/path_utils/path_utils.cfg.doxy.in b/path_utils/path_utils.cfg.doxy.in
|
||||||
|
index 306f8ec5eb247609606d9f49cbca8f3a376a3074..2b99a3f91f32ebaef0b8aaddf13a4b9822bcc862 100644
|
||||||
|
--- a/path_utils/path_utils.cfg.doxy.in
|
||||||
|
+++ b/path_utils/path_utils.cfg.doxy.in
|
||||||
|
@@ -810,7 +810,7 @@ HTML_STYLESHEET =
|
||||||
|
# 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_ALIGN_MEMBERS tag is set to YES, the members of classes,
|
||||||
|
# files or namespaces will be aligned in HTML using tables. If set to
|
||||||
|
diff --git a/refarray/ref_array.cfg.doxy.in b/refarray/ref_array.cfg.doxy.in
|
||||||
|
index 37f3356819ce20be4b3c429e618c8eea0802a54c..120f1f19d9f7108a70a208b7be76427e037a2793 100644
|
||||||
|
--- a/refarray/ref_array.cfg.doxy.in
|
||||||
|
+++ b/refarray/ref_array.cfg.doxy.in
|
||||||
|
@@ -810,7 +810,7 @@ HTML_STYLESHEET =
|
||||||
|
# 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_ALIGN_MEMBERS tag is set to YES, the members of classes,
|
||||||
|
# files or namespaces will be aligned in HTML using tables. If set to
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: ding-libs
|
Name: ding-libs
|
||||||
Version: 0.3.0.1
|
Version: 0.3.0.1
|
||||||
Release: 19%{?dist}
|
Release: 20%{?dist}
|
||||||
Summary: "Ding is not GLib" assorted utility libraries
|
Summary: "Ding is not GLib" assorted utility libraries
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
@ -21,6 +21,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
|||||||
### Patches ###
|
### Patches ###
|
||||||
Patch0001: 0001-INI-Bump-version-info.patch
|
Patch0001: 0001-INI-Bump-version-info.patch
|
||||||
Patch0002: 0002-Trim-trailing-spaces.patch
|
Patch0002: 0002-Trim-trailing-spaces.patch
|
||||||
|
Patch0003: 0003-DOXY-Don-t-generate-timestamp.patch
|
||||||
|
|
||||||
### Dependencies ###
|
### Dependencies ###
|
||||||
# ding-libs is a meta-package that will pull in all of its own
|
# ding-libs is a meta-package that will pull in all of its own
|
||||||
@ -324,6 +325,7 @@ structure
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0001 -p1 -b .version
|
%patch0001 -p1 -b .version
|
||||||
%patch0002 -p1 -b .whitespace
|
%patch0002 -p1 -b .whitespace
|
||||||
|
%patch0003 -p1 -b .doxygen
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
@ -358,6 +360,9 @@ rm -f */doc/html/installdox
|
|||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 27 2013 Jakub Hrozek <jhrozek@redhat.com> - 0.3.0.1-20
|
||||||
|
- Merge Doxygen patch from f19 branch to avoid regressions
|
||||||
|
|
||||||
* Fri Sep 27 2013 Jakub Hrozek <jhrozek@redhat.com> - 0.3.0.1-19
|
* Fri Sep 27 2013 Jakub Hrozek <jhrozek@redhat.com> - 0.3.0.1-19
|
||||||
- Apply a patch by Dmitri Pal to strip trailing whitespace
|
- Apply a patch by Dmitri Pal to strip trailing whitespace
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user