[kshutdown] Update to 3.0beta6

Sun Feb 24 08:23:46 UTC 2013

commit fe6d3526a53f89d45db5c495503794838263b5ff
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Sun Feb 24 09:22:53 2013 +0100

    Update to 3.0beta6

 .gitignore                      |    1 +
 hi128-app-kshutdown.png         |  Bin 12210 -> 0 bytes
 hi64-app-kshutdown.png          |  Bin 4886 -> 0 bytes
 kshutdown-usr-actions-cpp.patch |   61 ------------------
 kshutdown-usr-actions-h.patch   |   13 ----
 kshutdown.spec                  |  132 +++++++++++++++------------------------
 sources                         |    2 +-
 7 files changed, 53 insertions(+), 156 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b6aaafb..c071d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 kshutdown-1.0.1.tar.bz2
+/kshutdown-3.0beta6.tar.xz
diff --git a/kshutdown.spec b/kshutdown.spec
index 6e8221a..1525620 100644
--- a/kshutdown.spec
+++ b/kshutdown.spec
@@ -1,109 +1,79 @@
 Name:           kshutdown
-Version:        1.0.1
-Release:        8%{?dist}
-Summary:        KShutDown is an advanced shut down utility for KDE 3
+Version:        3.0
+Release:        0.1.beta6%{?dist}
+Summary:        Graphical shutdown utility for KDE 4
 
 Group:          Applications/System
 License:        GPLv2
 
 URL:            http://kshutdown.sourceforge.net/
-Source:         http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Source1:        hi64-app-kshutdown.png
-#Source2: so that kshutdown.png looks beautiful on katapult
-Source2:        hi128-app-kshutdown.png
-Patch0:         %{name}-usr-actions-h.patch
-Patch1:         %{name}-usr-actions-cpp.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  desktop-file-utils kdelibs3-devel
-# needed in kshutdown/actions.h
-Requires:       xscreensaver-base
+# Package from svn snapshots, create example:
+# svn export http://svn.code.sf.net/p/kshutdown/code/trunk/kshutdown2  kshutdown-3.0beta6
+# tar -cJvf kshutdown-3.0beta6.tar.xz kshutdown-3.0beta6
+Source:         %{name}-%{version}beta6.tar.xz
+
+BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kde-workspace-devel
+
 
 %description
-KShutDown is an advanced shut down utility for KDE 3.
+KShutdown is a graphical shutdown utility for KDE 4. It allows you to turn off
+or suspend computer at the specified time. It features various time and delay 
+options, command line support, and notifications.
 
 %prep
-%setup -q
-
-%patch0 -p0 -b .usr.h
-%patch1 -p0 -b .usr.cpp
+%setup -q -n %{name}-%{version}beta6
 
 %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 %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-
-#bug 241019
-echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-desktop-file-install --vendor fedora                        \
-        --dir %{buildroot}%{_datadir}/applications          \
-        --add-category Utility                              \
-        --delete-original                                   \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-
-%{__rm} -f %{buildroot}%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory
-
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
-%{__cp} -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
-%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../en/common $i/common
-      done
-    popd
-  fi
-done
-fi
+make install/fast  DESTDIR=%{buildroot} -C %{_target_platform}
+%find_lang %{name} --with-kde --all-name
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kshutdown.desktop
+
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO VERSION
+%doc LICENSE ChangeLog TODO
+%{_kde4_bindir}/kshutdown
+%{_kde4_datadir}/kde4/apps/kshutdown/extras/*
+%{_kde4_datadir}/kde4/apps/kshutdown/kshutdown.notifyrc
+%{_kde4_datadir}/applications/kde4/kshutdown.desktop
+%{_kde4_datadir}/icons/hicolor/*/apps/kshutdown.png
+%{_kde4_datadir}/icons/hicolor/*/apps/kshutdown.svgz
 
-%{_bindir}/%{name}
-
-# Should at all cost ship the .la file if not we'll struck the bug #224430
-# "The KShutDown applet could not be loaded. Please check your installation."
-%{_libdir}/kde3/%{name}lockout_panelapplet.la
-
-%{_libdir}/kde3/%{name}lockout_panelapplet.so
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/apps/%{name}
-%{_datadir}/apps/kconf_update/%{name}.upd
-%{_datadir}/apps/kicker/applets/%{name}lockout.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %Changelog
+* Sat Feb 16 2013 Jan Grulich <jgrulich at redhat.com> - 3.0-0.1.beta6
+- update to 3.0beta6
+
 * Thu Aug 23 2007 Chitlesh Goorah  <chitlesh [AT] fedoraproject DOT org> - 1.0.1-1
 - mass rebuild for fedora 8 - BuildID
 
@@ -139,4 +109,4 @@ touch --no-create %{_datadir}/icons/hicolor || :
 - Changed post/postun , lang part & buildrequires
 
 * Sun Mar 26 2006 Kushal Das <kushal at fedoraproject.org> 0.8.2-1
-- initial release
+- initial release
\ No newline at end of file
diff --git a/sources b/sources
index 16e4c6e..bd50a1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f65d969fcd08533e4ccdf6cdc5576f6  kshutdown-1.0.1.tar.bz2
+572a62cbe0a19c87c05303564f9041ec  kshutdown-3.0beta6.tar.xz
