rpms/filelight/devel .cvsignore, 1.2, 1.3 filelight.spec, 1.10, 1.11 sources, 1.2, 1.3

[Neal Becker]

Author: nbecker

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

Modified Files:
	.cvsignore filelight.spec sources 
Log Message:
Updates for kde4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/.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	1 Aug 2009 00:15:30 -0000	1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- filelight.spec	31 Jul 2009 23:27:50 -0000	1.10
+++ filelight.spec	1 Aug 2009 00:15:30 -0000	1.11
@@ -2,17 +2,18 @@
 
 Summary: Graphical disk usage statistics
 Name: filelight
-Version: 1.9rc2
-Release: 16%{?dist}
+Version: 1.9
+Release: 2.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tgz
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
+#Patch0: filelight.desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel bkebase4-devel desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -23,13 +24,16 @@ 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}
+pushd misc
+sed -i -e 's/MimeType/#MimeType/' filelight_part.desktop
+popd
 
 %build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath  #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+%{cmake_kde4}
+
+make %{?_smp_mflags} VERBOSE=1
+
 
 %install
 %{__rm} -rf %{buildroot}
@@ -37,10 +41,15 @@ source "/etc/profile.d/qt.sh"
 %{__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=""               \
+  --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
+  --vendor=""               \
   --delete-original					\
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+  ${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 || :
@@ -63,16 +72,20 @@ fi
 #%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
+%{_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
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/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	1 Aug 2009 00:15:30 -0000	1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957  filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210  filelight-1.9-rc2.tgz