SPECS: gDesklets.spec - updated am patch, removed obsolete locale-...

[qboosh]

Author: qboosh                       Date: Sun Aug 20 15:33:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated am patch, removed obsolete locale-names,disksize patches
- cleanups

---- Files affected:
SPECS:
   gDesklets.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/gDesklets.spec
diff -u SPECS/gDesklets.spec:1.66 SPECS/gDesklets.spec:1.67
--- SPECS/gDesklets.spec:1.66	Fri Aug 11 19:31:12 2006
+++ SPECS/gDesklets.spec	Sun Aug 20 17:33:30 2006
@@ -1,9 +1,4 @@
 # $Revision$, $Date$
-#
-# TODO:
-# - check unpackaged mime-related files
-# - check/fix no/nb locale
-#
 Summary:	gDesklets - an advanced architecture for desktop applets
 Summary(pl):	gDesklets - zaawansowana architektura dla apletów
 Name:		gDesklets
@@ -14,27 +9,24 @@
 Source0:	http://gdesklets.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	3f9ce7f2ca4522bc96cb9bc4a4b91774
 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.14.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.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.12.4
-BuildRequires:	python-pygtk-devel >= 2.8.6
+BuildRequires:	python-pygtk-devel >= 2:2.8.6
 BuildRequires:	python-pyorbit-devel >= 2.14.0
 BuildRequires:	rpmbuild(macros) >= 1.197
 %pyrequires_eq	python
-Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	shared-mime-info
 Requires:	python-gnome >= 2.12.4
@@ -43,7 +35,7 @@
 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.8.6
+Requires:	python-pygtk-gtk >= 2:2.8.6
 Requires:	python-pyorbit >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,14 +47,8 @@
 
 %prep
 %setup -q
-#patch 1&2 don't apply anymore
-#%patch0 -p1
-#%patch1 -p1 -b .wiget
-#%%patch2 -p1
-%patch3 -p1
-
-#breaks build
-#mv po/{no,nb}.po
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -70,8 +56,6 @@
 %{__automake}
 %{__autoconf}
 %configure
-# Doesn't produce schemas anyway now
-#	--disable-schemas-install
 %{__make} \
 	CFLAGS="%{rpmcflags}"
 
@@ -81,7 +65,8 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	UPDATE_DESKTOP_DATABASE= \
+	UPDATE_MIME_DATABASE=
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/gdesklets
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/gdesklets
@@ -89,8 +74,8 @@
 find $RPM_BUILD_ROOT%{_datadir}/gdesklets -name "*.py" -exec rm -f {} \;
 find $RPM_BUILD_ROOT%{_libdir}/gdesklets -name "*.py" -exec rm -f {} \;
 find $RPM_BUILD_ROOT%{_libdir}/gdesklets -name "*.la" -exec rm -f {} \;
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic,application/*}
-rm -f $RPM_BUILD_ROOT%{_desktopdir}/mimeinfo.cache
+
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang gdesklets
 
@@ -98,14 +83,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gdesklets-display-thumbnail.schemas
 %update_desktop_database_post
 umask 022
 update-mime-database %{_datadir}/mime ||:
 
-%preun
-%gconf_schema_uninstall gdesklets-display-thumbnail.schemas
-
 %postun
 %update_desktop_database_postun
 if [ $1 = 0 ]; then
@@ -233,6 +214,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/08/20 15:33:30  qboosh
+- updated am patch, removed obsolete locale-names,disksize patches
+- cleanups
+
 Revision 1.66  2006/08/11 17:31:12  ankry
 - more TODO, rel. 0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gDesklets.spec?r1=1.66&r2=1.67&f=u