[awesome] Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
Thomas Moschny
thm at fedoraproject.org
Sun Aug 18 22:18:06 UTC 2013
commit d90cfe55b7e109dd7c8bc7f52836c77368d09aca
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Mon Aug 19 00:16:33 2013 +0200
Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
- Fix bogus dates in the %changelog.
awesome.spec | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/awesome.spec b/awesome.spec
index 94b630e..29dd446 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,6 +1,6 @@
Name: awesome
Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Highly configurable, framework window manager for X. Fast, light and extensible
Group: User Interface/Desktops
# common/buffer.[ch]: BSD
@@ -60,6 +60,8 @@ Requires: rlwrap
# default editor
Requires: vi
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
%description
Awesome is a highly configurable, next generation framework window
@@ -73,6 +75,7 @@ control on its graphical environment.
%package doc
Summary: API doc files
Group: Documentation
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
%description doc
@@ -87,9 +90,10 @@ API doc files for awesome generated by luadoc.
%patch1 -p1 -b .lua-52
%patch2 -p1
+
%build
mkdir build; pushd build
-%cmake -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} \
+%cmake -DAWESOME_DOC_PATH=%{_pkgdocdir} \
-DXDG_CONFIG_DIR=%{_sysconfdir}/xdg \
-DLDOC_EXECUTABLE=%{_bindir}/ldoc \
..
@@ -103,13 +107,11 @@ make -C build DESTDIR="%{buildroot}" INSTALL="install -p" install
# verify desktop file
desktop-file-validate %{buildroot}%{_datadir}/xsessions/%{name}.desktop
-# move HTML docs
-mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
- %{buildroot}%{_docdir}/%{name}
-
%files
-%doc %{_docdir}/%{name}-%{version}/*
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/doc
%dir %{_sysconfdir}/xdg/%{name}
%config(noreplace) %{_sysconfdir}/xdg/%{name}/rc.lua
%{_bindir}/awesome
@@ -122,10 +124,15 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
%files doc
-%doc %{_docdir}/%{name}
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/doc
%changelog
+* Sun Aug 18 2013 Thomas Moschny <thomas.moschny at gmx.de> - 3.5.1-8
+- Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
+- Fix bogus dates in the %%changelog.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -278,7 +285,7 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
* Tue May 19 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.3.rc3
- 3.3-rc3
-* Thu May 13 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.2.rc2
+* Wed May 13 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.2.rc2
- 3.3-rc2
* Thu May 7 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.1.rc1
@@ -331,7 +338,7 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
- new dep: xsri
- %%{_datadir}/%%{name}/themes/default is now handled configfile
-* Thu Aug 15 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.3.rc3
+* Fri Aug 15 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.3.rc3
- bump to RC3
- xsession desktop file is now provided by upstream
- dumped patches
@@ -340,13 +347,13 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
both are now in upstream
- cmake is now need >2.6 (present in rawhide)
-* Thu Aug 11 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.2.rc2
+* Mon Aug 11 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.2.rc2
- bump to RC2
-* Thu Aug 04 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.1.rc1
+* Mon Aug 04 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.1.rc1
- bump to awesome v3-the new generation
-* Thu Jul 28 2008 Michal Nowak <mnowak at redhat.com> 2.3.3-1
+* Mon Jul 28 2008 Michal Nowak <mnowak at redhat.com> 2.3.3-1
- version bump fixes two bugs
- give floating dialogs of maximized windows focus
- awesomerc: fix xterm -e in case of others terms
More information about the scm-commits
mailing list