[ding-libs/f19] Add patches fixing fpmdiff issues
Ondrej Kos
okos at fedoraproject.org
Tue Jul 16 08:41:49 UTC 2013
commit 44712149cfd0ead4c05b4e9b5d1af6f58b5ac17e
Author: Ondrej Kos <okos at redhat.com>
Date: Tue Jul 16 10:22:29 2013 +0200
Add patches fixing fpmdiff issues
0002-DOXY-Don-t-generate-timestamp.patch | 82 ++++++++++++++++++++
...clude-the-right-filename-of-libini_config.patch | 25 ++++++
ding-libs.spec | 10 ++-
3 files changed, 116 insertions(+), 1 deletions(-)
---
diff --git a/0002-DOXY-Don-t-generate-timestamp.patch b/0002-DOXY-Don-t-generate-timestamp.patch
new file mode 100644
index 0000000..4929950
--- /dev/null
+++ b/0002-DOXY-Don-t-generate-timestamp.patch
@@ -0,0 +1,82 @@
+From 723ce0cd957d2b17618ca9698bcc66e61b9b6110 Mon Sep 17 00:00:00 2001
+From: Ondrej Kos <okos at 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
+
diff --git a/0003-rpm-Include-the-right-filename-of-libini_config.patch b/0003-rpm-Include-the-right-filename-of-libini_config.patch
new file mode 100644
index 0000000..945d9b0
--- /dev/null
+++ b/0003-rpm-Include-the-right-filename-of-libini_config.patch
@@ -0,0 +1,25 @@
+From dbde0566df490cb8a4c1119de45e6361b0ea4c18 Mon Sep 17 00:00:00 2001
+From: Jakub Hrozek <jhrozek at redhat.com>
+Date: Sat, 13 Jul 2013 09:10:34 +0200
+Subject: [PATCH 2/2] rpm: Include the right filename of libini_config
+
+---
+ contrib/ding-libs.spec.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/ding-libs.spec.in b/contrib/ding-libs.spec.in
+index 5e1065c6c39308ac5be2ccbff21f3c1f601796e5..14ff1f2f3dfd42fcae4bad7aba03a38177d6cb71 100644
+--- a/contrib/ding-libs.spec.in
++++ b/contrib/ding-libs.spec.in
+@@ -301,7 +301,7 @@ structure
+ %doc COPYING
+ %doc COPYING.LESSER
+ %{_libdir}/libini_config.so.3
+-%{_libdir}/libini_config.so.3.0.0
++%{_libdir}/libini_config.so.3.1.0
+
+ %files -n libini_config-devel
+ %defattr(-,root,root,-)
+--
+1.8.1.4
+
diff --git a/ding-libs.spec b/ding-libs.spec
index 1db656a..184f8b6 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
@@ -1,6 +1,6 @@
Name: ding-libs
Version: 0.3.0.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: "Ding is not GLib" assorted utility libraries
Group: Development/Libraries
License: LGPLv3+
@@ -20,6 +20,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
### Patches ###
Patch0001: 0001-INI-Bump-version-info.patch
+Patch0002: 0002-DOXY-Don-t-generate-timestamp.patch
+Patch0003: 0003-rpm-Include-the-right-filename-of-libini_config.patch
### Dependencies ###
# ding-libs is a meta-package that will pull in all of its own
@@ -322,6 +324,8 @@ structure
%prep
%setup -q
%patch0001 -p1 -b .version
+%patch0002 -p1 -b .version
+%patch0003 -p1 -b .version
%build
autoreconf -ivf
@@ -356,6 +360,10 @@ rm -f */doc/html/installdox
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 16 2013 Ondrej Kos <okos at redhat.com> - 0.3.0.1-18
+- Apply patch to stop generating doxygen timestamps
+- Apply patch to include correct libini_config file
+
* Thu May 23 2013 Jakub Hrozek <jhrozek at redhat.com> - 0.3.0.1-17
- Apply patch by Ondrej Kos to bump libtool version info
More information about the scm-commits
mailing list