[libaccounts-qt] Fix duplicate documentation (#1001255)
Michael Schwendt
mschwendt at fedoraproject.org
Sat Dec 14 20:53:57 UTC 2013
commit dadc9dc1588bb797dfca0ae96cbf5186ea102756
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Sat Dec 14 21:54:01 2013 +0100
Fix duplicate documentation (#1001255)
- Add %?_isa to -devel base package dep
- Remove %defattr
libaccounts-qt.spec | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec
index b6d03c4..441ba51 100644
--- a/libaccounts-qt.spec
+++ b/libaccounts-qt.spec
@@ -1,6 +1,6 @@
Name: libaccounts-qt
Version: 1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Accounts framework Qt bindings
Group: System Environment/Libraries
License: LGPLv2
@@ -17,7 +17,7 @@ Framework to provide accounts for Qt.
%package devel
Summary: Development files for accounts-qt
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt4-devel%{?_isa}
%description devel
@@ -44,25 +44,30 @@ rm -f %{buildroot}/%{_datadir}/doc/accounts-qt/html/installdox
rm -rf %{buildroot}%{_datadir}/%{name}-tests
rm -f %{buildroot}%{_bindir}/accountstest
-mv %{buildroot}%{_docdir}/accounts-qt %{buildroot}%{_docdir}/libaccounts-qt
+# move installed docs to include them in subpackage via %%doc magic
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv %{buildroot}%{_docdir}/accounts-qt __tmp_doc
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/lib*.so.*
%files devel
-%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_includedir}/accounts-qt/
%{_libdir}/pkgconfig/accounts-qt.pc
-%{_docdir}/libaccounts-qt
+%doc __tmp_doc/accounts-qt/*
%changelog
+* Sat Dec 14 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-4
+- Fix duplicate documentation (#1001255)
+- Add %%?_isa to -devel base package dep
+- Remove %%defattr
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list