[LogService] Fix duplicate documentation (#1001301) by using only %doc magic
Michael Schwendt
mschwendt at fedoraproject.org
Sun Dec 15 13:41:44 UTC 2013
commit fa815820ebeb19d4d658fd1e3a737320e85e7bf5
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Sun Dec 15 14:41:50 2013 +0100
Fix duplicate documentation (#1001301) by using only %doc magic
- Add BR graphviz (for images in doxygen docs)
- Use sed to disable HTML_TIMESTAMP setting in Doxyfile.in
- Fix URL tags (pages have moved)
- Add ChangeLog to %doc
- Remove empty %doc lines
- Remove obsolete BuildRoot definition/cleaning
- Fix -devel package Group tag to "Development/Libraries"
- Add %?_isa to -devel base package dep
- Remove %defattr
LogService.spec | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/LogService.spec b/LogService.spec
index ceeb50e..c954bae 100644
--- a/LogService.spec
+++ b/LogService.spec
@@ -6,22 +6,22 @@
Name: LogService
Version: 2.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: DIET middleware logging service
Group: System Environment/Daemons
License: CeCILL
-URL: http://graal.ens-lyon.fr/DIET/logservice.html
+URL: http://graal.ens-lyon.fr/DIET/diet-tools/logservice
Source0: %{name}-%{version}.tar.gz
Source1: %{upstream_name}.init
Source2: %{upstream_name}.config
Source3: %{upstream_name}.service
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake >= 2.6.3
BuildRequires: chrpath
BuildRequires: omniORB-devel >= 4.1.2
BuildRequires: doxygen
+BuildRequires: graphviz
BuildRequires: python-docutils
%if 0%{?with_systemd}
Requires(post): systemd-units
@@ -40,14 +40,17 @@ DIET grid middleware logging service
%package devel
Summary: Development files for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package contains development files for %{name}.
%prep
%setup -q
+# disable timestamp in Doxygen page footers to avoid conflict between
+# multiarch -devel packages (this flag defaults to NO in Fedora doxygen)
+sed -i '/^HTML_TIMESTAMP/d' Cmake/Doxyfile.in
%build
%cmake -DLOGSERVICE_BUILD_DOXYGEN:BOOL=ON .
@@ -55,8 +58,12 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
+
+# move installed docs to include them via %%doc magic
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv %{buildroot}%{_docdir}/%{name}/html __tmp_doc
+
%if 0%{?with_systemd}
mkdir -p %{buildroot}/lib/systemd/system/
install -m 0644 %{SOURCE3} %{buildroot}/lib/systemd/system/
@@ -69,8 +76,6 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{upstream_nam
chrpath --delete %{buildroot}%{_bindir}/*
chrpath --delete %{buildroot}%{_libdir}/*
-%clean
-rm -rf %{buildroot}
%pre
getent group %{upstream_name} >/dev/null || groupadd -r %{upstream_name}
@@ -121,8 +126,7 @@ fi
%endif
%files
-%defattr(-,root,root,-)
-%doc README LICENCE_eng LICENCE_fr
+%doc README LICENCE_eng LICENCE_fr ChangeLog
%if 0%{?with_systemd}
/lib/systemd/system/%{upstream_name}.service
%else
@@ -139,16 +143,26 @@ fi
%{_mandir}/man1/*
%files devel
-%defattr(-,root,root,-)
-%doc
%{_includedir}/*.hh
%{_libdir}/libLogForwarderUtils.so
%{_libdir}/libLogServiceToolBase.so
%{_libdir}/libLogServiceComponentBase.so
-%{_docdir}/%{name}/html/*
+%doc __tmp_doc/html
%{_mandir}/man3/*
%changelog
+* Sun Dec 15 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.8.0-5
+- Fix duplicate documentation (#1001301) by using only %%doc magic
+- Add BR graphviz (for images in doxygen docs)
+- Use sed to disable HTML_TIMESTAMP setting in Doxyfile.in
+- Fix URL tags (pages have moved)
+- Add ChangeLog to %%doc
+- Remove empty %%doc lines
+- Remove obsolete BuildRoot definition/cleaning
+- Fix -devel package Group tag to "Development/Libraries"
+- Add %%?_isa to -devel base package dep
+- Remove %%defattr
+
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list