rpms/filelight/devel filelight.ChangeLog.diff, NONE, 1.1 filelight_part.desktop.diff, NONE, 1.1 filelight.spec, 1.11, 1.12

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/filelight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25517

Modified Files:
	filelight.spec 
Added Files:
	filelight.ChangeLog.diff filelight_part.desktop.diff 
Log Message:
Updates for 1.9-rc2


filelight.ChangeLog.diff:
 ChangeLog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filelight.ChangeLog.diff ---
diff -u ChangeLog.orig ChangeLog
--- ChangeLog.orig	2009-08-02 19:22:12.000000000 -0400
+++ ChangeLog	2009-08-02 19:25:37.000000000 -0400
@@ -52,7 +52,7 @@
      Compile bug fixed for GCC < 3
      Fixed crash bug when scan had been stopped and then back then forward pressed
      Fixed another compile bug for systems that don't support large files (Debian apparently)
-     Internationalisation support thanks to patch from André Somers
+     Internationalisation support thanks to patch from André Somers
      Made the tooltip translucent (NOT a gimmick, this feature is essential IMO)
      Started making debug messages use kdDebug so users can enable/disable the messages
      Implemented XML GUI

filelight_part.desktop.diff:
 filelight_part.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE filelight_part.desktop.diff ---
--- misc/filelight_part.desktop~	2009-08-02 19:06:43.000000000 -0400
+++ misc/filelight_part.desktop	2009-08-02 19:06:33.000000000 -0400
@@ -12,7 +12,6 @@
 Name[tr]=RadialMap Görüntüleme
 Name[uk]=Перегляд RadialMap
 Name[x-test]=xxRadialMap Viewxx
-MimeType=inode/directory;
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=filelightpart
 # X-KDE-PluginKeyword=filelightpart


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- filelight.spec	1 Aug 2009 00:15:30 -0000	1.11
+++ filelight.spec	2 Aug 2009 23:42:55 -0000	1.12
@@ -3,17 +3,19 @@
 Summary: Graphical disk usage statistics
 Name: filelight
 Version: 1.9
-Release: 2.rc2%{?dist}
+Release: 3.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
 %define upstreamversion %{version}-rc2
 Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
-#Patch0: filelight.desktop.patch
+Patch0: filelight_part.desktop.diff
+Patch1: filelight.ChangeLog.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs-devel kdebase-devel desktop-file-utils qimageblitz-devel
+BuildRequires: kdelibs-devel kdebase-devel
+BuildRequires: desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -25,25 +27,28 @@ directories having child segments.
 
 %prep
 %setup -q -n %{name}-%{upstreamversion}
-pushd misc
-sed -i -e 's/MimeType/#MimeType/' filelight_part.desktop
-popd
+%patch0 -p0
+%patch1 -p0
 
 %build
-%{cmake_kde4}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}  VERBOSE=1
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{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					\
+  --delete-original                                     \
   ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
 
 desktop-file-install --vendor="" \
@@ -70,8 +75,8 @@ fi
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 #%doc %{_docdir}/HTML/en/filelight/
-%config(noreplace) %{_datadir}/config/filelightrc
-%{_bindir}/filelight
+%{_datadir}/config/filelightrc
+%{_kde4_bindir}/filelight
 %{_kde4_datadir}/applications/kde4/filelight.desktop
 %{_kde4_libdir}/kde4/filelightpart.so
 %{_kde4_datadir}/kde4/apps/filelightpart/
@@ -83,10 +88,15 @@ fi
 
 
 %changelog
+* Sun Aug  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-3.rc2
+- fix some rpmlint complaints:
+- Follow cmake_kde4 recipe
+  untabify
+  convert ChangeLog to utf8
+  don't mark filelightrc as config
+
 * Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-2.rc2
 - Updates for kde4
-
-* Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9rc2-16
 - Update to 1.9rc2
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16