- updated to 0.33

Changed files:
    gDesklets-am.patch -> 1.3
    gDesklets-locale-names.patch -> 1.3
    gDesklets.spec -> 1.49

diff --git a/gDesklets-am.patch b/gDesklets-am.patch
index 53338d7023ff340e40c77a9a340a1b4a8248572a..2352aa10d1ce7589305f14bae4414096d30f29e9 100644 (file)
--- a/gDesklets-am.patch
+++ b/gDesklets-am.patch
@@ -1,58 +1,5 @@
-diff -Nuard gDesklets-0.24.1.orig/acinclude.m4 gDesklets-0.24.1/acinclude.m4
---- gDesklets-0.24.1.orig/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gDesklets-0.24.1/acinclude.m4      2003-11-16 23:44:03.000000000 +0100
-@@ -0,0 +1,25 @@
-+dnl a macro to check for ability to create python extensions
-+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-+dnl function also defines PYTHON_INCLUDES
-+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-+[AC_REQUIRE([AM_PATH_PYTHON])
-+AC_MSG_CHECKING(for headers required to compile python extensions)
-+dnl deduce PYTHON_INCLUDES
-+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+if test "$py_prefix" != "$py_exec_prefix"; then
-+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+fi
-+AC_SUBST(PYTHON_INCLUDES)
-+dnl check if the headers exist:
-+save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-+AC_TRY_CPP([#include <Python.h>],dnl
-+[AC_MSG_RESULT(found)
-+$1],dnl
-+[AC_MSG_RESULT(not found)
-+$2])
-+CPPFLAGS="$save_CPPFLAGS"
-+])
-+
-diff -Nuard gDesklets-0.24.1.orig/configure.in gDesklets-0.24.1/configure.in
---- gDesklets-0.24.1.orig/configure.in 2003-11-10 14:15:50.000000000 +0100
-+++ gDesklets-0.24.1/configure.in      2003-11-16 23:46:29.000000000 +0100
-@@ -10,7 +10,7 @@
- AC_PROG_INTLTOOL
- AC_PROG_LN_S
- 
--AM_PATH_PYTHON
-+AM_PATH_PYTHON(2.2)
- 
- GDESKLETS_CORE_REQS="gnome-python-2.0 >= 1.99.17 pygtk-2.0 >= 1.99.17 gdk-2.0 gtk+-2.0 libgtop-2.0 >= 2.0.0"
- AC_SUBST(GDESKLETS_CORE_REQS)
-@@ -19,8 +19,8 @@
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
- 
--CHECK_PYTHON_INCLUDE
--PYTHON_CFLAGS="-I$PYTHONINC"
-+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+PYTHON_CFLAGS="$PYTHON_INCLUDES"
- AC_SUBST(PYTHON_CFLAGS)
- 
- ALL_LINGUAS="ar az de de_BY el es fr he ms nl pl pt sq sr sr@Latn sv tr ko"
-diff -Nuard gDesklets-0.24.1.orig/tools/Makefile.am gDesklets-0.24.1/tools/Makefile.am
---- gDesklets-0.24.1.orig/tools/Makefile.am    2003-11-07 17:55:34.000000000 +0100
-+++ gDesklets-0.24.1/tools/Makefile.am 2003-11-16 23:26:49.000000000 +0100
+--- gDesklets-0.33/tools/Makefile.am.wiget     2003-12-09 18:53:21.000000000 +0100
++++ gDesklets-0.33/tools/Makefile.am   2005-01-03 08:54:36.090980834 +0100
 @@ -1,6 +1,6 @@
  bin_PROGRAMS = gdesklets-display-thumbnailer
  
@@ -61,3 +8,17 @@ diff -Nuard gDesklets-0.24.1.orig/tools/Makefile.am gDesklets-0.24.1/tools/Makef
              -Wstrict-prototypes             \
              -Wmissing-prototypes            \
              -DG_DISABLE_DEPRECATED          \
+
+--- gDesklets-0.33/configure.in.wiget  2005-01-01 18:04:48.000000000 +0100
++++ gDesklets-0.33/configure.in        2005-01-03 08:59:46.739872833 +0100
+@@ -53,8 +53,8 @@
+     AC_MSG_RESULT(no)
+ fi
+ 
+-AM_PATH_PYTHON([2.3])
+-PYTHON_PREFIX=`python -c "import sys; print sys.prefix"`
++AM_PATH_PYTHON([2.4])
++PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+ PYTHON_CFLAGS="-I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
+ AC_CHECK_HEADER([$PYTHON_PREFIX/include/python$PYTHON_VERSION/Python.h],,
+     AC_ERROR([Can't find Python.h! You will need the python development package

diff --git a/gDesklets-locale-names.patch b/gDesklets-locale-names.patch
index 84490252502dec3552786e88c875a059c7ee4b82..19e2cf7e6c41cc2e418e454a9db45f75851376d4 100644 (file)
--- a/gDesklets-locale-names.patch
+++ b/gDesklets-locale-names.patch
@@ -1,12 +1,11 @@
-diff -urN aa/gDesklets-0.26/configure.in gDesklets-0.26/configure.in
---- aa/gDesklets-0.26/configure.in     2004-02-10 13:40:43.000000000 +0100
-+++ gDesklets-0.26/configure.in        2004-02-23 11:20:19.973570088 +0100
-@@ -32,7 +32,7 @@
- PYTHON_CFLAGS="-I$PYTHONINC"
- AC_SUBST(PYTHON_CFLAGS)
+--- gDesklets-0.33/configure.in.wiget  2005-01-03 09:01:44.567506649 +0100
++++ gDesklets-0.33/configure.in        2005-01-03 09:03:01.740162941 +0100
+@@ -85,7 +85,7 @@
+ AC_SUBST(TILING_CFLAGS)
+ AC_SUBST(TILING_LIBS)
  
--ALL_LINGUAS="ar az bg ca cs de el en_CA en_GB es eu fr he hr hu is it ja lt ms nl no pl pt pt_BR ru sq sr sr@Latn sv tr ko"
-+ALL_LINGUAS="ar az bg ca cs de el en_CA en_GB es eu fr he hr hu is it ja lt ms nb nl pl pt pt_BR ru sq sr sr@Latn sv tr ko"
+-ALL_LINGUAS="ar az bg ca cs de el en_CA en_GB es eu fr he hr hu is it ja lt ms nl no pa pl pt pt_BR ru sq sr sr@Latn sv tr ko uk"
++ALL_LINGUAS="ar az bg ca cs de el en_CA en_GB es eu fr he hr hu is it ja lt ms nb nl pa pl pt pt_BR ru sq sr sr@Latn sv tr ko uk"
  AC_SUBST(ALL_LINGUAS)
  GETTEXT_PACKAGE=gdesklets
  AC_SUBST(GETTEXT_PACKAGE)

diff --git a/gDesklets.spec b/gDesklets.spec
index 7185e60d2df54d4937f29fca342e9b1cc7b54997..65397ceb474009f645c1f937f2ec4db41f1deaf6 100644 (file)
--- a/gDesklets.spec
+++ b/gDesklets.spec
@@ -1,12 +1,12 @@
 Summary:       gDesklets - an advanced architecture for desktop applets
 Summary(pl):   gDesklets - zaawansowana architektura dla apletów
 Name:          gDesklets
-Version:       0.30
-Release:       5
+Version:       0.33
+Release:       0.1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://www.pycage.de/download/gdesklets/%{name}-%{version}.tar.bz2
-# Source0-md5: 20c0d1c4aff84ea29ec777b72319045c
+# Source0-md5: 9fe413c1614416be4e55735ad2de8cd6
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-locale-names.patch
 Patch2:                %{name}-disksize.patch
@@ -48,8 +48,8 @@ gDesklets udost
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .wiget
+#%%patch2 -p1
 %patch3 -p1
 
 mv po/{no,nb}.po
@@ -80,6 +80,8 @@ find $RPM_BUILD_ROOT%{_datadir}/gdesklets -name "*.py" -exec rm -f {} \;
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic,application/*}
 rm -f $RPM_BUILD_ROOT%{_desktopdir}/mimeinfo.cache
 
+%find_lang gdesklets
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -93,63 +95,109 @@ update-mime-database %{_datadir}/mime
 umask 022
 [ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
 
-%files
+%files -f gdesklets.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README TODO
 %attr(755,root,root) %{_bindir}/*
-%{_pkgconfigdir}/*.pc
-%dir %{_datadir}/gdesklets
-%{_datadir}/gdesklets/*.py[co]
-%attr(755,root,root) %{_datadir}/gdesklets/gdesklets
-%attr(755,root,root) %{_datadir}/gdesklets/gdesklets-daemon
-%attr(755,root,root) %{_datadir}/gdesklets/gdesklets-shell
-%dir %{_datadir}/gdesklets/locale
-%lang(ar) %{_datadir}/gdesklets/locale/ar
-%lang(bg) %{_datadir}/gdesklets/locale/bg
-%lang(ca) %{_datadir}/gdesklets/locale/ca
-%lang(cs) %{_datadir}/gdesklets/locale/cs
-%lang(de) %{_datadir}/gdesklets/locale/de
-%lang(es) %{_datadir}/gdesklets/locale/es
-%lang(el) %{_datadir}/gdesklets/locale/el
-%lang(en_CA) %{_datadir}/gdesklets/locale/en_CA
-%lang(en_GB) %{_datadir}/gdesklets/locale/en_GB
-%lang(eu) %{_datadir}/gdesklets/locale/eu
-%lang(hr) %{_datadir}/gdesklets/locale/hr
-%lang(hu) %{_datadir}/gdesklets/locale/hu
-%lang(is) %{_datadir}/gdesklets/locale/is
-%lang(it) %{_datadir}/gdesklets/locale/it
-%lang(ja) %{_datadir}/gdesklets/locale/ja
-%lang(ko) %{_datadir}/gdesklets/locale/ko
-%lang(lt) %{_datadir}/gdesklets/locale/lt
-%lang(tr) %{_datadir}/gdesklets/locale/tr
-%lang(fr) %{_datadir}/gdesklets/locale/fr
-%lang(he) %{_datadir}/gdesklets/locale/he
-%lang(nb) %{_datadir}/gdesklets/locale/nb
-%lang(nl) %{_datadir}/gdesklets/locale/nl
-%lang(pl) %{_datadir}/gdesklets/locale/pl
-%lang(pt) %{_datadir}/gdesklets/locale/pt
-%lang(pt_BR) %{_datadir}/gdesklets/locale/pt_BR
-%lang(ru) %{_datadir}/gdesklets/locale/ru
-%lang(sq) %{_datadir}/gdesklets/locale/sq
-%lang(sr) %{_datadir}/gdesklets/locale/sr
-%lang(sr@Latn) %{_datadir}/gdesklets/locale/sr@Latn
-%lang(sv) %{_datadir}/gdesklets/locale/sv
-%lang(az) %{_datadir}/gdesklets/locale/az
-%lang(ms) %{_datadir}/gdesklets/locale/ms
-%{_datadir}/gdesklets/Controls
-%{_datadir}/gdesklets/config
-%{_datadir}/gdesklets/data
-%{_datadir}/gdesklets/display
-%{_datadir}/gdesklets/factory
-%{_datadir}/gdesklets/libdesklets
-%{_datadir}/gdesklets/main
-%{_datadir}/gdesklets/plugin
-%{_datadir}/gdesklets/scripting
-%{_datadir}/gdesklets/sensor
-%{_datadir}/gdesklets/shell
-%{_datadir}/gdesklets/utils
-%{_datadir}/gdesklets/Sensors
-%{_datadir}/gdesklets/Displays
+#%{_pkgconfigdir}/*.pc
+%dir %{_libdir}/gdesklets
+%{_libdir}/gdesklets/*.py[co]
+%attr(755,root,root) %{_libdir}/gdesklets/gdesklets
+%attr(755,root,root) %{_libdir}/gdesklets/gdesklets-daemon
+%attr(755,root,root) %{_libdir}/gdesklets/gdesklets-logview
+%attr(755,root,root) %{_libdir}/gdesklets/gdesklets-migration-tool
+%attr(755,root,root) %{_libdir}/gdesklets/gdesklets-shell
+
+%dir %{_libdir}/gdesklets/Controls
+%{_libdir}/gdesklets/Controls/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/Calendar
+%{_libdir}/gdesklets/Controls/Calendar/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/HDDTemp
+%{_libdir}/gdesklets/Controls/HDDTemp/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/Sensors
+%{_libdir}/gdesklets/Controls/Sensors/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/System
+%{_libdir}/gdesklets/Controls/System/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/Time
+%{_libdir}/gdesklets/Controls/Time/*.py[co]
+
+%dir %{_libdir}/gdesklets/Sensors
+%dir %{_libdir}/gdesklets/Sensors/External
+%{_libdir}/gdesklets/Sensors/External/*.py[co]
+%dir %{_libdir}/gdesklets/Sensors/FontSelector
+%{_libdir}/gdesklets/Sensors/FontSelector/*.py[co]
+
+%dir %{_libdir}/gdesklets/config
+%{_libdir}/gdesklets/config/*.py[co]
+%dir %{_libdir}/gdesklets/display
+%{_libdir}/gdesklets/display/*.py[co]
+%dir %{_libdir}/gdesklets/factory
+%{_libdir}/gdesklets/factory/*.py[co]
+
+%dir %{_libdir}/gdesklets/libdesklets
+%{_libdir}/gdesklets/libdesklets/*.py[co]
+%dir %{_libdir}/gdesklets/libdesklets/controls
+%{_libdir}/gdesklets/libdesklets/controls/*.py[co]
+%dir %{_libdir}/gdesklets/libdesklets/system
+%{_libdir}/gdesklets/libdesklets/system/*.py[co]
+%{_libdir}/gdesklets/libdesklets/system/*.so
+%dir %{_libdir}/gdesklets/libdesklets/system/FreeBSD
+%{_libdir}/gdesklets/libdesklets/system/FreeBSD/*.py[co]
+%dir %{_libdir}/gdesklets/libdesklets/system/Linux
+%{_libdir}/gdesklets/libdesklets/system/Linux/*.py[co]
+%dir %{_libdir}/gdesklets/libdesklets/system/NetBSD
+%{_libdir}/gdesklets/libdesklets/system/NetBSD/*.py[co]
+%dir %{_libdir}/gdesklets/libdesklets/system/OpenBSD
+%{_libdir}/gdesklets/libdesklets/system/OpenBSD/*.py[co]
+
+%dir %{_libdir}/gdesklets/main
+%{_libdir}/gdesklets/main/*.py[co]
+%dir %{_libdir}/gdesklets/plugin
+%{_libdir}/gdesklets/plugin/*.py[co]
+%dir %{_libdir}/gdesklets/scripting
+%{_libdir}/gdesklets/scripting/*.py[co]
+%dir %{_libdir}/gdesklets/sensor
+%{_libdir}/gdesklets/sensor/*.py[co]
+%dir %{_libdir}/gdesklets/shell
+%{_libdir}/gdesklets/shell/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins
+%dir %{_libdir}/gdesklets/shell/plugins/ControlBrowser
+%{_libdir}/gdesklets/shell/plugins/ControlBrowser/*.py[co]
+%{_libdir}/gdesklets/shell/plugins/ControlBrowser/*.png
+%dir %{_libdir}/gdesklets/shell/plugins/ControlCollection
+%{_libdir}/gdesklets/shell/plugins/ControlCollection/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/ControlsView
+%{_libdir}/gdesklets/shell/plugins/ControlsView/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/DisplayBrowser
+%{_libdir}/gdesklets/shell/plugins/DisplayBrowser/*.py[co]
+%{_libdir}/gdesklets/shell/plugins/DisplayBrowser/*.png
+%dir %{_libdir}/gdesklets/shell/plugins/DisplayCollection
+%{_libdir}/gdesklets/shell/plugins/DisplayCollection/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/DisplayView
+%{_libdir}/gdesklets/shell/plugins/DisplayView/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/Help
+%{_libdir}/gdesklets/shell/plugins/Help/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/Menu
+%{_libdir}/gdesklets/shell/plugins/Menu/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/PackageInstaller
+%{_libdir}/gdesklets/shell/plugins/PackageInstaller/*.py[co]
+%{_libdir}/gdesklets/shell/plugins/PackageInstaller/*.png
+%dir %{_libdir}/gdesklets/shell/plugins/Profiles
+%{_libdir}/gdesklets/shell/plugins/Profiles/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/Shell
+%{_libdir}/gdesklets/shell/plugins/Shell/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/StatusBar
+%{_libdir}/gdesklets/shell/plugins/StatusBar/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/ViewSwitch
+%{_libdir}/gdesklets/shell/plugins/ViewSwitch/*.py[co]
+%dir %{_libdir}/gdesklets/shell/plugins/gDeskletsClient
+%{_libdir}/gdesklets/shell/plugins/gDeskletsClient/*.py[co]
+
+%dir %{_libdir}/gdesklets/utils
+%{_libdir}/gdesklets/utils/*.py[co]
+%{_libdir}/gdesklets/utils/*.so
+
+%{_libdir}/gdesklets/data
 %{_datadir}/mime/packages/*.xml
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*