rpms/kdetoys/devel .cvsignore, 1.10, 1.11 kdetoys.spec, 1.11, 1.12 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24620

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.96.2-1
- kde-3.96.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Oct 2007 21:31:43 -0000	1.10
+++ .cvsignore	29 Nov 2007 21:46:08 -0000	1.11
@@ -1,3 +1 @@
-clog
-kdetoys-3.5.7.tar.bz2
-kdetoys-3.5.8.tar.bz2
+kdetoys-3.96.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdetoys.spec	13 Oct 2007 21:31:43 -0000	1.11
+++ kdetoys.spec	29 Nov 2007 21:46:08 -0000	1.12
@@ -1,126 +1,139 @@
 
-Summary: K Desktop Environment - Toys and Amusements
-Name: 	 kdetoys
-Group:	 Amusements/Graphics
-Epoch:	 7
-Version: 3.5.8
-Release: 1%{?dist}
-
-License: GPLv2+
-Url:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: desktop-file-utils
-BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: gettext
+Name:           kdetoys
+Summary:        K Desktop Environment - Toys and Amusements
+Epoch:          7
+Version:        3.96.2
+Release:        1%{?dist}
+
+License:        GPLv2
+Group:          Amusements/Graphics
+URL:            http://www.kde.org/
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: cmake
+BuildRequires: kde-filesystem >= 4
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: libXcomposite-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libxkbfile-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXv-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: giflib-devel
+BuildRequires: pcre-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXScrnSaver-devel
+
+Requires: kdelibs4 >= %{version}
+#Requires: kdebase-workspace
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 
-#Requires(hint): kdebase3 >= %{version}
 
 %description
-Includes: 
+%{name} includes:
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
-* eyesapplet: a kicker applet similar to XEyes
-* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
-* kmoon: system tray applet showing the moon phase
-* kodo: mouse movement meter
-* kteatime: system tray applet that makes sure your tea doesn't get too strong
+* eyesapplet: similar to XEyes
+* fifteenapplet: order 15 pieces in a 4x4 square by moving them
+* kmoon: shows the moon phase
+* kteatime: makes sure your tea does not get too strong
 * ktux: Tux-in-a-Spaceship screen saver
-* kweather: kicker applet that will display the current weather outside
-* kworldwatch: application and kicker applet showing daylight area on the world
-               globe
-
-NOTE: kicker applets and screen savers require kdebase to be installed, 
-and user to be logged-in to KDE.
+* kweather: display the current weather outside
+* kworldwatch: shows daylight area on the world globe
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
+%setup -q
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --includedir=%{_includedir}/kde \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf "%{buildroot}"
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=%{buildroot}
 
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
-
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications/kde \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
-
-# replace absolute symlink with relative
-ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips
-
-## 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 ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-## Unpackaged files
-# not sure the point of just one header file 'AmorIface.h', omit (for now).
-rm -rf %{buildroot}%{_includedir}
+%clean
+rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_bindir}/*
-%{_libdir}/libkdeinit_*.*
-%{_libdir}/kde3/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
-%{_datadir}/apps/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/service*/*.desktop
+%{_kde4_bindir}/*
+%{_kde4_appsdir}/amor/
+%{_kde4_appsdir}/kicker/
+%{_kde4_appsdir}/kdesktop/
+%{_kde4_appsdir}/kmoon/
+%{_kde4_appsdir}/kteatime/
+%{_kde4_appsdir}/ktux/
+%{_kde4_appsdir}/kweather/
+%{_kde4_appsdir}/kweatherservice/
+%{_kde4_appsdir}/kworldclock/
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_docdir}/HTML/en/amor/
+%{_kde4_docdir}/HTML/en/kmoon/
+%{_kde4_docdir}/HTML/en/kteatime/
+%{_kde4_docdir}/HTML/en/kweather/
+%{_kde4_docdir}/HTML/en/kworldclock/
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libkdeinit4_*.*
 
 
-%clean
-rm -rf %{buildroot}
+%changelog
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.96.2-1
+- kde-3.96.2
 
+* Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.96.1-2
+- touchup a bit for cvs import
+- drop libs subpkg (no shlibs present) 
+
+* Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.1-1
+- kde-3.96.1
+
+* Fri Nov 23 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-5
+- libs subpkg
+- also use epoch in changelog (also backwards)
+
+* Mon Nov 19 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-4
+- BR: kde-filesystem >= 4
+- rebuild to get newer cmake options and silent rpath problems
+
+* Mon Nov 19 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-3
+- BR: libXScrnSaver-devel
+- BR: libXtst-devel
+
+* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
+- +BRs: kde4-macros(api), libXcomposite-devel, libXdamage-devel
+- +BRs: libxkbfile-devel, libXpm-devel, libXv-devel, giflib-devel
+- +BRs: libXxf86misc-devel, pcre-devel
+- +R: kdelibs4-devel
+
+* Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-1
+- Initial kde4 version for Fedora
 
-%changelog
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
 - kde-3.5.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Oct 2007 21:31:43 -0000	1.8
+++ sources	29 Nov 2007 21:46:08 -0000	1.9
@@ -1 +1 @@
-b42c1f08e5c4ac93a04aadb75679139f  kdetoys-3.5.8.tar.bz2
+e9909257e3363ad937783badb5a769bf  kdetoys-3.96.2.tar.bz2