[control-center/f18] Update to recent packaging guidelines

Ray Strode rstrode at fedoraproject.org
Wed Sep 26 03:56:04 UTC 2012


commit 178ce5afc1508d7364687eb165807abe8defb7fe
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Wed Sep 26 11:41:44 2012 +0800

    Update to recent packaging guidelines
    
    This removes the now obsolete 'Group:' tag, and update the scriptlets.
    
    It also makes the filesystem subpackage own a previously unowned dir.

 control-center.spec |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/control-center.spec b/control-center.spec
index c618056..ddb92b0 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -20,7 +20,6 @@ Version: 3.6.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
-Group: User Interface/Desktops
 #VCS: git:git://git.gnome.org/gnome-control-center
 Source: http://download.gnome.org/sources/gnome-control-center/3.5/gnome-control-center-%{version}.tar.xz
 URL: http://www.gnome.org
@@ -117,7 +116,6 @@ properties, screen resolution, and other settings.
 
 %package filesystem
 Summary: GNOME Control Center directories
-Group: Development/Libraries
 # NOTE: this is an "inverse dep" subpackage. It gets pulled in
 # NOTE: by the main package an MUST not depend on the main package
 
@@ -174,21 +172,21 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 
 %post
 /sbin/ldconfig
-update-desktop-database --quiet %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig
-update-desktop-database --quiet %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ]; then
-  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{gettext_package}.lang
 %doc AUTHORS COPYING NEWS README
@@ -243,6 +241,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %dir %{_datadir}/gnome/wm-properties
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings
+%dir %{_datadir}/gnome-control-center/sounds
 
 
 %changelog


More information about the scm-commits mailing list