rpms/rsibreak/F-10 rsibreak.spec,1.10,1.11

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/rsibreak/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7717

Modified Files:
	rsibreak.spec 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
- fix %find_lang usage
- BR: kdelibs4-devel plasma-devel



Index: rsibreak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsibreak/F-10/rsibreak.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rsibreak.spec	1 Dec 2008 22:40:14 -0000	1.10
+++ rsibreak.spec	14 Jan 2009 15:38:46 -0000	1.11
@@ -1,8 +1,7 @@
-%define desktopvendor fedora
 
 Name:           rsibreak
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -10,7 +9,10 @@
 Source0:        http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel desktop-file-utils gettext
+# note, build fails with kde >= 4.2, since plasma moved into kdelibs and
+# CMakeLists.txt macros/usage need updating
+BuildRequires:  kdelibs4-devel desktop-file-utils gettext
+BuildRequires:  plasma-devel
 
 %description
 RSIBreak is a small utility which bothers you at certain intervals. The
@@ -32,10 +34,11 @@
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} plasma_applet_%{name}
+%find_lang %{name} --with-kde
+%find_lang plasma_applet_%{name}
+cat plasma_applet_%{name}.lang >> %{name}.lang
 
 # validate desktop file
 desktop-file-install --vendor ""                          \
@@ -44,11 +47,9 @@
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
 
 %postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +57,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS TODO
+# These could/should be updated to %%_kde4_* equivalents, 
+# see /etc/rpm/macros.kde4 -- Rex
 %{_bindir}/rsibreak
 %{_datadir}/autostart/rsibreak.desktop
 %{_datadir}/applications/kde4/rsibreak.desktop
@@ -68,11 +71,14 @@
 %{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
 %{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
 %{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
-%{_docdir}/HTML/*/rsibreak
 %{_libdir}/kde4/plasma_engine_rsibreak.so                         
 %{_libdir}/kde4/plasma_applet_rsibreak.so                         
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
+- fix %%find_lang usage
+- BR: kdelibs4-devel plasma-devel
+
 * Fri Nov 28 2008 Roland Wolters <wolters.liste at gmx.net> 0.9.0-2
 - update to version 0.9 featuring a KDE 4 version