[kdegames] cleanup .spec

Rex Dieter rdieter at fedoraproject.org
Wed Jun 13 02:34:31 UTC 2012


commit c292046591f7d063bc61ef5a5e4e7454d8b8ffd7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 12 21:36:55 2012 -0500

    cleanup .spec
    
    remove deprecated rpm'isms, move scriptlets near their %%files

 kdegames.spec |   51 +++++++++++++++++++--------------------------------
 1 files changed, 19 insertions(+), 32 deletions(-)
---
diff --git a/kdegames.spec b/kdegames.spec
index 40ae5bb..78b8f87 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -6,7 +6,6 @@ Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
-Group:   Amusements/Games
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -16,10 +15,6 @@ Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdegames-%{version}.tar.xz
 Patch0: kdegames-4.8.1-minimal.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## upstream patches
-
 # Klickety moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-9
 
@@ -104,7 +99,6 @@ Games for KDE 4, including:
 %package minimal
 Summary: Minimal set of KDE Games
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Group:   Amusements/Games
 %description minimal
 A minimal set of games for KDE 4, including:
 * kmines
@@ -113,12 +107,10 @@ A minimal set of games for KDE 4, including:
 
 %package libs
 Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
 %description libs
 %{summary}.
 
 %package devel
-Group:    Development/Libraries
 Summary:  Header files for compiling KDE 4 game applications
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdegames4-devel < %{version}-%{release}
@@ -168,9 +160,6 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%post minimal
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
@@ -178,11 +167,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 
-%posttrans minimal
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
 %postun
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
@@ -195,22 +179,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
-%postun minimal
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-fi
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%clean
-rm -rf %{buildroot}
-
 %if 0%{?fedora}
 %files
 %doc AUTHORS README
@@ -436,6 +404,22 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/application-x-palapeli.*
 %endif
 
+%post minimal
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans minimal
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%postun minimal
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
+
 %files minimal
 %doc AUTHORS README
 %{_kde4_appsdir}/carddecks/
@@ -464,6 +448,9 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kpat/
 %{_kde4_iconsdir}/hicolor/*/*/kpat.*
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %doc COPYING
 %if 0%{?fedora}


More information about the scm-commits mailing list