[libnotifymm] fix duplicate documentation (#1001237)
Michael Schwendt
mschwendt at fedoraproject.org
Thu Dec 12 22:44:18 UTC 2013
commit 5ba38f761962c7fe53b7655c9ad3c86a137a99a9
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Thu Dec 12 23:44:22 2013 +0100
fix duplicate documentation (#1001237)
- move installed documentation for %doc usage in -devel subpackage
- use %?_isa in -devel package deps
libnotifymm.spec | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/libnotifymm.spec b/libnotifymm.spec
index 83bff06..e8685e9 100644
--- a/libnotifymm.spec
+++ b/libnotifymm.spec
@@ -2,7 +2,7 @@
Name: libnotifymm
Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ interface for libnotify
Group: System Environment/Libraries
@@ -26,10 +26,9 @@ freely combined to quickly create complex user interfaces.
%package devel
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtkmm24-devel
-Requires: libnotify-devel
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: gtkmm24-devel%{?_isa}
+Requires: libnotify-devel%{?_isa}
%description devel
@@ -48,8 +47,12 @@ make %{?_smp_mflags}
%install
-make install DESTDIR=%buildroot INSTALL="install -p" \
- referencedir=%{_pkgdocdir}/html
+make install DESTDIR=%buildroot INSTALL="install -p"
+
+# move installed documentation for %%doc usage in -devel subpackage
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv %{buildroot}%{_datadir}/doc/%{name}-%{apiver}/reference __tmp_doc
+
find %buildroot -type f -name "*.la" -exec rm -f {} ';'
# Remove code-generation related files
rm -rf %buildroot%{_libdir}/%{name}-%{apiver}
@@ -67,13 +70,18 @@ rm -rf %buildroot%{_libdir}/%{name}-%{apiver}
%files devel
-%{_pkgdocdir}
+%doc __tmp_doc/reference/*
%{_includedir}/%{name}-%{apiver}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/devhelp/books/%{name}-1.0
%changelog
+* Thu Dec 12 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.0-2
+- fix duplicate documentation (#1001237)
+- move installed documentation for %%doc usage in -devel subpackage
+- use %%?_isa in -devel package deps
+
* Tue Aug 06 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 0.7.0-1
- upstream 0.7.0
- refresh spec
More information about the scm-commits
mailing list