[valkyrie] Workaround rpm changes disabling the doc --parent hack in f19
nathans
nathans at fedoraproject.org
Mon Mar 4 04:51:02 UTC 2013
commit ba2e8f485ade0ed1a6900f9b8107222c7fcd605f
Author: Nathan Scott <nathans at redhat.com>
Date: Mon Mar 4 15:50:56 2013 +1100
Workaround rpm changes disabling the doc --parent hack in f19
valkyrie.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/valkyrie.spec b/valkyrie.spec
index 96a6cc1..3089be1 100644
--- a/valkyrie.spec
+++ b/valkyrie.spec
@@ -1,6 +1,6 @@
Name: valkyrie
Version: 2.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Graphical User Interface for Valgrind Suite
%global valkyrie %{name}-%{version}
@@ -42,8 +42,9 @@ make INSTALL_ROOT=%{buildroot} install
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
install -d %{buildroot}%{_datadir}/pixmaps/
install -m 644 %{_builddir}/%{valkyrie}/icons/%{name}.xpm %{buildroot}%{_datadir}/pixmaps/
-# move images to a more suitable spot for the doc --parents expansion:
-mv %{_builddir}/%{valkyrie}/doc/images %{_builddir}/%{valkyrie}/images
+cp -p %{_builddir}/%{valkyrie}/COPYING %{buildroot}%{_docdir}/%{valkyrie}
+cp -p %{_builddir}/%{valkyrie}/INSTALL %{buildroot}%{_docdir}/%{valkyrie}
+cp -p %{_builddir}/%{valkyrie}/README %{buildroot}%{_docdir}/%{valkyrie}
%clean
rm -rf %{buildroot}
@@ -53,10 +54,12 @@ rm -rf %{buildroot}
%{_bindir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
-%doc COPYING INSTALL README doc/*.css doc/*.html
-%doc --parents images/*.png
+%{_docdir}/%{valkyrie}
%changelog
+* Mon Mar 4 2013 Nathan Scott <nathans at redhat.com> 2.0.0-7
+- Remove use of --parent option to %%doc expansion, no longer works.
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list