[kiosktool] fresh kde4 1.99 svn snapshot

[Rex Dieter]

commit 61a74b92ba7222459473bc2e1a455519d4bee50d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Apr 12 12:53:52 2012 -0500

    fresh kde4 1.99 svn snapshot

 .gitignore                    |    3 +-
 kiosktool-1.99-handbook.patch |    6 +++
 kiosktool.spec                |   89 +++++++++++++++++++----------------------
 sources                       |    2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d0ded4..6316145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-kiosktool-1.0.tar.bz2
+/kiosktool-1.0.tar.bz2
+/kiosktool-1.99-20120412svn.tar.bz2
diff --git a/kiosktool-1.99-handbook.patch b/kiosktool-1.99-handbook.patch
new file mode 100644
index 0000000..a056c30
--- /dev/null
+++ b/kiosktool-1.99-handbook.patch
@@ -0,0 +1,6 @@
+diff -up kiosktool-1.99/doc/CMakeLists.txt.handbook kiosktool-1.99/doc/CMakeLists.txt
+--- kiosktool-1.99/doc/CMakeLists.txt.handbook	2012-04-12 12:07:33.000000000 -0500
++++ kiosktool-1.99/doc/CMakeLists.txt	2012-04-12 12:41:38.678677778 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kiosktool )
diff --git a/kiosktool.spec b/kiosktool.spec
index e61fadd..854ad8a 100644
--- a/kiosktool.spec
+++ b/kiosktool.spec
@@ -1,20 +1,26 @@
 
+%define snap 20120412svn
+
 Summary: KIOSK administration tool for KDE
 Name:	 kiosktool
-Version: 1.0
-Release: 13%{?dist}
+Version: 1.99
+Release: 1.%{snap}%{?dist}
 
 License: GPLv2
 Group:	 System Environment/Base
 URL:	 http://extragear.kde.org/apps/kiosktool/
-Source:	 ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin/kiosktool-%{version}.tar.bz2
+# use create_tarball.rb script from kdesdk/scripts, then rename for %%{snap}
+Source0: kiosktool-%{version}-%{snap}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # empty defaults
 Source1: kde-user-profile
 
+## upstreamable patches
+Patch50: kiosktool-1.99-handbook.patch
+
 BuildRequires: gettext
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs4-devel
 
 %description
 A Point and Click tool for system administrators to enable KDE's KIOSK 
@@ -24,76 +30,63 @@ features or otherwise preconfigure KDE for groups of users.
 %prep
 %setup -q
 
+%patch50 -p1 -b .handbook
 
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
 
-make %{?_smp_mflags}
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # create/own profile dir
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde-profile/
+mkdir -p %{buildroot}%{_sysconfdir}/kde-profile/
 
 # empty default settings
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde-user-profile
-
-## File lists
-# locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$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 ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde-user-profile
 
+%find_lang %{name} --with-kde
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kiosktool.desktop
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
-%postun
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING README
-#attr(0511,root,root) %{_bindir}/kiosktool*
-%{_bindir}/kiosktool*
-%{_datadir}/applications/kde/kiosktool.desktop
-%{_datadir}/apps/kiosktool/
-%{_datadir}/icons/crystalsvg/*/*/*
+%{_kde4_bindir}/kiosktool*
+%{_kde4_datadir}/applications/kde4/kiosktool.desktop
+%{_kde4_appsdir}/kiosktool/
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_sysconfdir}/kde-profile/
 %config(noreplace) %{_sysconfdir}/kde-user-profile
 
 
 %changelog
+* Thu Apr 12 2012 Rex Dieter <rdieter at fedoraproject.org> 1.99-1.20120412svn
+- fresh kde4 1.99 svn snapshot
+
 * Tue Aug 11 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0-13
 - Use bzipped upstream tarball.
 
diff --git a/sources b/sources
index a2399b8..608533d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1576cdaa3cff93255fd5d7f6835b07e2  kiosktool-1.0.tar.bz2
+d785da85fa288beda51165827e399f91  kiosktool-1.99-20120412svn.tar.bz2