[filelight] 4.7.90 (#761559)

[Rex Dieter]

commit 80900cd8869cfb2992b205162d11333dad279ccf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Dec 19 10:10:29 2011 -0600

    4.7.90 (#761559)

 .gitignore                  |    2 +-
 filelight.ChangeLog.diff    |   12 ----
 filelight.desktop.patch     |   11 ----
 filelight.spec              |  117 +++++++++++++++++++-----------------------
 filelight_part.desktop.diff |   10 ----
 mainWindow.cpp.diff         |   22 --------
 sources                     |    2 +-
 7 files changed, 55 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2b3200..c56947d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-filelight-1.9-rc3.tgz
+/filelight-4.7.90.tar.bz2
diff --git a/filelight.spec b/filelight.spec
index 656bf1b..7fa3206 100644
--- a/filelight.spec
+++ b/filelight.spec
@@ -1,35 +1,35 @@
-# Upstream: Max Howell <filelight$methylblue,com>
-
-Summary: Graphical disk usage statistics
-Name: filelight
-Version: 1.9
-Release: 6.rc3%{?dist}.1
-License: GPLv2+
-Group: Applications/System
-URL: http://www.methylblue.com/filelight/
-
-%define upstreamversion %{version}-rc3
-Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
-Patch0: filelight_part.desktop.diff
-Patch1: mainWindow.cpp.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: kdelibs-devel kdebase-devel
-BuildRequires: desktop-file-utils qimageblitz-devel
-Requires: hicolor-icon-theme
+
+Name:    filelight 
+Summary: Graphical disk usage statistics 
+Version: 4.7.90
+Release: 2%{?dist}
+
+# KDE e.V. may determine that future GPL versions are accepted
+License: GPLv2 or GPLv3
+#URL:    https://projects.kde.org/projects/kde/kdeutils/filelight
+URL:     http://utils.kde.org/projects/filelight
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= %{version}
+
+# when split occured
+Conflicts: kdeutils-common < 6:4.7.80
+
+Obsoletes: kdeutils-filelight < 6:4.7.80
+Provides:  kdeutils-filelight = 6:%{version}-%{release}
+
+%{?_kde4:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
+
 
 %description
-Filelight graphically represents a file system as a set of concentric
-segmented-rings, indicating where diskspace is being used. Segments
-expanding from the center represent files (including directories),
-with each segment's size being proportional to the file's size and
-directories having child segments.
+Filelight allows you to quickly understand exactly where your diskspace
+is being used by graphically representing your file system.
+
 
 %prep
-%define directory %{name}-%{version}rc3
-%setup -q -n %{directory}
-%patch0 -p0
-%patch1 -p0
+%setup -q -n %{name}-%{version}
+
 
 %build
 mkdir -p %{_target_platform}
@@ -37,58 +37,47 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}  VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-%{__rm} -rf %{buildroot}
-mkdir %{buildroot}
-%{__make} install DESTDIR="%{buildroot}" -C %{_target_platform}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install  \
-  --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
-  --vendor=""               \
-  --delete-original                                     \
-  ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
-
-desktop-file-install --vendor="" \
-    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
-    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/filelight_part.desktop
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde --without-mo
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-#%doc %{_docdir}/HTML/en/filelight/
-%{_datadir}/config/filelightrc
+%files -f %{name}.lang
+%doc COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_kde4_bindir}/filelight
+%{_kde4_appsdir}/filelight*/
+%{_kde4_configdir}/filelightrc
 %{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_kde4_datadir}/kde4/services/filelightpart.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*filelight.*
 %{_kde4_libdir}/kde4/filelightpart.so
-%{_kde4_datadir}/kde4/apps/filelightpart/
-%{_kde4_appsdir}/filelight
-%{_kde4_iconsdir}/hicolor/*/*/filelight.png
-%{_kde4_iconsdir}/hicolor/*/*/view_filelight.png
-%{_kde4_datadir}/kde4/services/filelight*.desktop
-##%{_kde4_iconsdir}/locolor/*/*/filelight.png
 
 
 %changelog
+* Mon Dec 19 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.90-2
+- 4.7.90 (#761559)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-6.rc3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 9ff2adc..2e858cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a75cb50bc0b7238507952fb7d1b8d8a8  filelight-1.9-rc3.tgz
+ddfb6602a343ef4a7e73da9315401308  filelight-4.7.90.tar.bz2