rpms/rsibreak/F-9 .cvsignore, 1.3, 1.4 rsibreak.spec, 1.8, 1.9 sources, 1.3, 1.4

[Roland Wolters]

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21124

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
Update to KDE 4 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 21:45:32 -0000	1.3
+++ .cvsignore	21 Jan 2009 21:26:35 -0000	1.4
@@ -1 +1 @@
-Rsibreak-0.8.0.tar.bz2
+rsibreak-0.9.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/rsibreak.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rsibreak.spec	22 Feb 2008 11:20:42 -0000	1.8
+++ rsibreak.spec	21 Jan 2009 21:26:35 -0000	1.9
@@ -1,16 +1,18 @@
-%define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.8.0
-Release:        5%{?dist}
+Version:        0.9.0
+Release:        3%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
+Source0:        http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs3-devel libXScrnSaver-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
@@ -23,30 +25,31 @@
 %setup -q
 
 %build
-%configure	--disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+%{__rm} -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-/usr/bin/desktop-file-install --vendor=""                       \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/kde     \
-        --add-category=X-Fedora                                 \
-        %{buildroot}%{_datadir}/applications/kde/rsibreak.desktop
+%find_lang %{name} --with-kde
+%find_lang plasma_applet_%{name}
+cat plasma_applet_%{name}.lang >> %{name}.lang
+
+# validate desktop file
+desktop-file-install --vendor ""                          \
+        --dir %{buildroot}%{_datadir}/applications/kde4   \
+        %{buildroot}%{_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
+xdg-icon-resource forceupdate --theme hicolor 2> /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 || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,17 +57,31 @@
 %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}/applications/kde/rsibreak.desktop
-%{_datadir}/apps/rsibreak
 %{_datadir}/autostart/rsibreak.desktop
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/icons/hicolor/16x16/apps/rsibreak.png
-%{_datadir}/icons/hicolor/22x22/apps/rsibreak.png
-%{_datadir}/icons/hicolor/32x32/apps/rsibreak.png
-%{_docdir}/HTML/*/rsibreak
+%{_datadir}/applications/kde4/rsibreak.desktop
+%{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
+%{_datadir}/icons/hicolor/*/apps/rsibreak*.png
+%{_datadir}/icons/hicolor/*/actions/rsibreak*.png
+%{_datadir}/icons/hicolor/32x32/actions/duringbreaks.png                                                                                                                          
+%{_datadir}/icons/hicolor/32x32/actions/timings.png 
+%{_datadir}/kde4/apps/rsibreak/rsibreak.notifyrc
+%{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
+%{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
+%{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
+%{_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
+
 * Fri Feb 22 2008 Roland Wolters <wolters.liste at gmx.net> 0.8.0-5
 - rebuild after dbug bug has been fixed in devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 21:45:32 -0000	1.3
+++ sources	21 Jan 2009 21:26:35 -0000	1.4
@@ -1 +1 @@
-62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2
+cf1e35c1b7d419559298a7fb5d1232be  rsibreak-0.9.0.tar.bz2