X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gDesklets.spec;h=9f52c326232b3763ff24c71784cbd253b02dfbf4;hb=7f05f30aac086ce66cf5b958f84e6c46b6f0519e;hp=a2f0aadf8cfb15dce9e226b62d7cf76920588cda;hpb=a549a12f04f6449331bb9f92b2a65e387fdad50a;p=packages%2FgDesklets.git

diff --git a/gDesklets.spec b/gDesklets.spec
index a2f0aad..9f52c32 100644
--- a/gDesklets.spec
+++ b/gDesklets.spec
@@ -1,67 +1,64 @@
 Summary:	gDesklets - an advanced architecture for desktop applets
-Summary(pl):	gDesklets - zaawansowana architektura dla apletów
+Summary(pl.UTF-8):	gDesklets - zaawansowana architektura dla apletów
 Name:		gDesklets
-Version:	0.33
-Release:	0.1
+Version:	0.35.4
+Release:	0.2
 License:	GPL
 Group:		X11/Applications
-Source0:	http://www.pycage.de/download/gdesklets/%{name}-%{version}.tar.bz2
-# Source0-md5:	9fe413c1614416be4e55735ad2de8cd6
+#Source0Download: http://gdesklets.org/
+Source0:	http://gdesklets.org/files/%{name}-%{version}.tar.bz2
+# Source0-md5:	61644df16206ce8797757ab306badd28
 Patch0:		%{name}-am.patch
-Patch1:		%{name}-locale-names.patch
-Patch2:		%{name}-disksize.patch
-Patch3:		%{name}-plugin_registry.patch
+Patch1:		%{name}-plugin_registry.patch
 URL:		http://gdesklets.gnomedesktop.org/
-BuildRequires:	GConf2-devel >= 2.4.0
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.2.0
+BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	intltool
-BuildRequires:	libgnomeui-devel >= 2.2.0
-BuildRequires:	libgtop-devel >= 2.0.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libgtop-devel >= 2.14.0
 BuildRequires:	librsvg-devel
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.3
-BuildRequires:	python-gnome-devel >= 2.0.0
-BuildRequires:	python-pygtk-devel >= 2.0.0
+BuildRequires:	python-gnome-devel >= 2.12.4
+BuildRequires:	python-pygtk-devel >= 2:2.8.6
+BuildRequires:	python-pyorbit-devel >= 2.14.0
 BuildRequires:	rpm-pythonprov
-BuildRequires:	swig-python
+BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	shared-mime-info
 %pyrequires_eq	python
-Requires:	python-gnome >= 2.0.0
-Requires:	python-gnome-bonobo >= 2.0.0
-Requires:	python-gnome-bonobo-ui >= 2.0.0
-Requires:	python-gnome-gconf >= 2.0.0
-Requires:	python-gnome-gtkhtml >= 2.0.0
-Requires:	python-gnome-ui >= 2.0.0
-Requires:	python-pygtk-gtk >= 2.0.0
-Requires(post): GConf2
-Requires(post):	shared-mime-info
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	shared-mime-info
+Requires:	python-gnome >= 2.12.4
+Requires:	python-gnome-bonobo >= 2.12.4
+Requires:	python-gnome-bonobo-ui >= 2.12.4
+Requires:	python-gnome-gconf >= 2.12.4
+Requires:	python-gnome-extras-gtkhtml >= 2.12.4
+Requires:	python-gnome-ui >= 2.12.4
+Requires:	python-pygtk-gtk >= 2:2.8.6
+Requires:	python-pyorbit >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 gDesklets provides an advanced architecture for desktop applets.
 
-%description -l pl
-gDesklets udostêpnia zaawansowan± architekturê dla apletów.
+%description -l pl.UTF-8
+gDesklets udostępnia zaawansowaną architekturę dla apletów.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1 -b .wiget
-#%%patch2 -p1
-%patch3 -p1
-
-mv po/{no,nb}.po
+%patch1 -p1
 
 %build
 %{__libtoolize}
+%{__intltoolize}
 %{__aclocal}
 %{__automake}
 %{__autoconf}
-%configure \
-	--disable-schemas-install
-	
+%configure
 %{__make} \
 	CFLAGS="%{rpmcflags}"
 
@@ -71,14 +68,16 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gdesklets/{Sensors,Displays}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	mimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes \
+	UPDATE_DESKTOP_DATABASE= \
+	UPDATE_MIME_DATABASE=
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/gdesklets
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/gdesklets
 
 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 $RPM_BUILD_ROOT%{_libdir}/gdesklets -name "*.py" -exec rm -f {} \;
+find $RPM_BUILD_ROOT%{_libdir}/gdesklets -name "*.la" -exec rm -f {} \;
 
 %find_lang gdesklets
 
@@ -86,14 +85,16 @@ rm -f $RPM_BUILD_ROOT%{_desktopdir}/mimeinfo.cache
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_desktop_database_post
 umask 022
-%gconf_schema_install
-update-mime-database %{_datadir}/mime
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime ||:
 
 %postun
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%update_desktop_database_postun
+if [ $1 = 0 ]; then
+	umask 022
+	update-mime-database %{_datadir}/mime
+fi
 
 %files -f gdesklets.lang
 %defattr(644,root,root,755)
@@ -101,12 +102,12 @@ umask 022
 %attr(755,root,root) %{_bindir}/*
 #%{_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
+%attr(755,root,root) %{_libdir}/gdesklets/ctrlinfo
 
 %dir %{_libdir}/gdesklets/Controls
 %{_libdir}/gdesklets/Controls/*.py[co]
@@ -120,6 +121,8 @@ umask 022
 %{_libdir}/gdesklets/Controls/System/*.py[co]
 %dir %{_libdir}/gdesklets/Controls/Time
 %{_libdir}/gdesklets/Controls/Time/*.py[co]
+%dir %{_libdir}/gdesklets/Controls/URI
+%{_libdir}/gdesklets/Controls/URI/*.py[co]
 
 %dir %{_libdir}/gdesklets/Sensors
 %dir %{_libdir}/gdesklets/Sensors/External
@@ -134,13 +137,16 @@ umask 022
 %dir %{_libdir}/gdesklets/factory
 %{_libdir}/gdesklets/factory/*.py[co]
 
+%dir %{_libdir}/gdesklets/layout/
+%{_libdir}/gdesklets/layout/*.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
+%attr(755,root,root) %{_libdir}/gdesklets/libdesklets/system/*.so
 %dir %{_libdir}/gdesklets/libdesklets/system/FreeBSD
 %{_libdir}/gdesklets/libdesklets/system/FreeBSD/*.py[co]
 %dir %{_libdir}/gdesklets/libdesklets/system/Linux
@@ -201,6 +207,5 @@ umask 022
 %{_datadir}/mime/packages/*.xml
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
-%{_iconsdir}/gnome/48x48/mimetypes/*.png
+%{_iconsdir}/hicolor/*/*/*.png
 %{_mandir}/man1/*
-%{_sysconfdir}/gconf/schemas/*.schemas