[libdbusmenu] switch to unversioned documentation directory
Eduardo Javier Echeverria Alvarado
echevemaster at fedoraproject.org
Tue Aug 27 05:57:11 UTC 2013
commit bf4610f88076704dfe34eb8d0eb3dad830c35953
Author: Eduardo Echeverria <echevemaster at gmail.com>
Date: Tue Aug 27 01:26:54 2013 -0430
switch to unversioned documentation directory
libdbusmenu.spec | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/libdbusmenu.spec b/libdbusmenu.spec
index a056e58..0d3af08 100644
--- a/libdbusmenu.spec
+++ b/libdbusmenu.spec
@@ -1,6 +1,14 @@
+%if 0%{?fedora} >= 20
+%global tools_doc %{_docdir}/%{name}-tools
+%global glib_doc %{_docdir}/%{name}-glib-devel
+%else
+%global tools_doc %{_docdir}/%{name}-tools-%{version}
+%global glib_doc %{_docdir}/%{name}-glib-devel-%{version}
+%endif
+
Name: libdbusmenu
Version: 12.10.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A library that pulling out some code out of indicator-applet
# All files installed in final rpms use C sources with dual licensing headers.
@@ -158,14 +166,14 @@ popd
# Put documentation in correct directory
-install -dm755 %{buildroot}%{_docdir}/%{name}-tools-%{version}/
+install -dm755 %{buildroot}%{tools_doc}/
mv %{buildroot}%{_docdir}/%{name}/README.dbusmenu-bench \
- %{buildroot}%{_docdir}/%{name}-tools-%{version}/
+ %{buildroot}%{tools_doc}
# Put examples in correct documentation directory
-install -dm755 %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/
+install -dm755 %{buildroot}%{glib_doc}/examples/
mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \
- %{buildroot}%{_docdir}/%{name}-glib-devel-%{version}/examples/
+ %{buildroot}%{glib_doc}/examples/
%post -p /sbin/ldconfig
@@ -191,9 +199,9 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \
%{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc
%{_datadir}/gir-1.0/Dbusmenu-0.4.gir
%{_datadir}/vala/vapi/Dbusmenu-0.4.vapi
-%dir %{_docdir}/%{name}-glib-devel-%{version}/
-%dir %{_docdir}/%{name}-glib-devel-%{version}/examples/
-%doc %{_docdir}/%{name}-glib-devel-%{version}/examples/glib-server-nomenu.c
+%dir %{glib_doc}/
+%dir %{glib_doc}/examples/
+%doc %{glib_doc}/examples/glib-server-nomenu.c
%files jsonloader
%{_libdir}/libdbusmenu-jsonloader.so.*
@@ -245,10 +253,13 @@ mv %{buildroot}%{_docdir}/%{name}/examples/glib-server-nomenu.c \
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/json/
%{_datadir}/%{name}/json/test-gtk-label.json
-%dir %{_docdir}/%{name}-tools-%{version}/
-%{_docdir}/%{name}-tools-%{version}/README.dbusmenu-bench
+%dir %{tools_doc}/
+%{tools_doc}/README.dbusmenu-bench
%changelog
+* Mon Aug 26 2013 Eduardo Echeverria <echevemaster at gmail.com> - 12.10.2-5
+- switch to unversioned documentation directory
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.10.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list