[yelp] Don't create empty /usr/share/gnome/help directory

Kalev Lember kalev at fedoraproject.org
Sat May 25 11:13:25 UTC 2013


commit 1d93858f552681bd43275b9edeed66e34fab9272
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat May 25 12:37:43 2013 +0200

    Don't create empty /usr/share/gnome/help directory
    
    As per the current packaging guidelines, this should be owned by
    individual packages that install files in there:
    
    https://fedoraproject.org/wiki/Packaging:Guidelines#The_directory_is_owned_by_a_package_which_is_not_required_for_your_package_to_function
    
    Removing this directory from yelp makes sure that packagers won't add a
    dep on yelp just because they notice that it happens to own the empty
    directory, as happened in:
    
    http://pkgs.fedoraproject.org/cgit/grilo-plugins.git/commit/?id=c24254c4
    https://bugzilla.redhat.com/show_bug.cgi?id=964421

 yelp.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/yelp.spec b/yelp.spec
index 1c3fcdf..c3db2b9 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -81,8 +81,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libyelp.a
 rm $RPM_BUILD_ROOT%{_libdir}/libyelp.la
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/gnome/help
-
 %find_lang %{name}
 
 %check
@@ -112,7 +110,6 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 %doc ChangeLog AUTHORS COPYING MAINTAINERS NEWS README
 %{_bindir}/*
 %{_datadir}/applications/yelp.desktop
-%dir %{_datadir}/gnome/help
 %{_datadir}/yelp
 %{_datadir}/glib-2.0/schemas/org.gnome.yelp.gschema.xml
 %{_datadir}/yelp-xsl/xslt/common/domains/yelp.xml
@@ -129,6 +126,8 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 %changelog
 * Sat May 25 2013 Kalev Lember <kalevlember at gmail.com> - 1:3.8.1-3
 - Make yelp-libs dep arch-specific, thanks to Michael Schwendt (#967180)
+- Don't create empty /usr/share/gnome/help directory: this should be owned by
+  individual packages that install files in there (#964421)
 
 * Sat May 18 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1:3.8.1-2
 - yelp should depend on yelp-libs not the other way around


More information about the scm-commits mailing list