[glabels] Fix bug 831384 (doc file conflict).
Peter Gordon
pgordon at fedoraproject.org
Wed Jun 13 04:44:32 UTC 2012
commit 0cb217e79cd121700db2dd7759f612d7243d819d
Author: Peter Gordon <peter at thecodergeek.com>
Date: Tue Jun 12 21:44:20 2012 -0700
Fix bug 831384 (doc file conflict).
glabels.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/glabels.spec b/glabels.spec
index bb7965f..e3214a5 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,6 +1,6 @@
Name: glabels
Version: 3.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: A program for creating labels and business cards for GNOME
Group: Applications/Publishing
@@ -135,7 +135,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
%files devel
%doc AUTHORS COPYING-LIBS
-%doc %{_datadir}/gtk-doc/html/libglabels-3.0/
%{_includedir}/libglabels-3.0/
%{_includedir}/libglbarcode-3.0/
%{_libdir}/libglabels-3.0.so
@@ -167,6 +166,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
%changelog
+* Tue Jun 12 2012 Peter Gordon <peter at thecodergeek.com> - 3.0.0-15
+- Fix %%doc files conflict between the glabels-devel and glabels-doc
+ subpackages.
+- Resolves: #831384 (glabels-devel-3.0.0-14.fc17.i686 doc file conflict)
+
* Tue Mar 20 2012 Peter Gordon <peter at thecodergeek.com> - 3.0.0-14
- Add patch to fix child schemas in the gschema.xml file:
+ fix-child-schemas.patch
More information about the scm-commits
mailing list