rpms/filelight/F-11 .cvsignore, 1.2, 1.3 filelight.spec, 1.8, 1.9 sources, 1.2, 1.3

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/filelight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31099

Modified Files:
	.cvsignore filelight.spec sources 
Log Message:
update to 1.9rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:07:14 -0000	1.2
+++ .cvsignore	3 Aug 2009 12:24:01 -0000	1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/filelight.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- filelight.spec	24 Feb 2009 19:26:04 -0000	1.8
+++ filelight.spec	3 Aug 2009 12:24:01 -0000	1.9
@@ -2,17 +2,20 @@
 
 Summary: Graphical disk usage statistics
 Name: filelight
-Version: 1.0
-Release: 15%{?dist}
+Version: 1.9
+Release: 3.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tar.bz2
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
+Patch0: filelight_part.desktop.diff
+Patch1: filelight.ChangeLog.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs3-devel >= 3.2 desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel
+BuildRequires: desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -23,24 +26,35 @@ with each segment's size being proportio
 directories having child segments.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -b .orig
+%setup -q -n %{name}-%{upstreamversion}
+%patch0 -p0
+%patch1 -p0
 
 %build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath  #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+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}%{_datadir}/applications/kde \
-  --add-category="X-Fedora" --vendor=""               \
-  --delete-original					\
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+  --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
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -61,18 +75,33 @@ fi
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 #%doc %{_docdir}/HTML/en/filelight/
-%config(noreplace) %{_datadir}/config/filelightrc
-%{_bindir}/filelight
-%{_datadir}/applications/kde/filelight.desktop
-%{_datadir}/apps/filelight/
-%{_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{_datadir}/icons/hicolor/*/apps/filelight.png
-%{_datadir}/services/filelight_part.desktop
-%{_libdir}/kde3/libfilelight.la
-%{_libdir}/kde3/libfilelight.so
+%{_datadir}/config/filelightrc
+%{_kde4_bindir}/filelight
+%{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_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
+* 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
+- Update to 1.9rc2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
 - use noreplace on config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2006 20:07:14 -0000	1.2
+++ sources	3 Aug 2009 12:24:01 -0000	1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957  filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210  filelight-1.9-rc2.tgz