- fix duplicate file install, force -j1 on install

- use update_mime_database macro

Changed files:
    gDesklets.spec -> 1.76
    install-duplicate.patch -> 1.1

diff --git a/gDesklets.spec b/gDesklets.spec
index 9f52c326232b3763ff24c71784cbd253b02dfbf4..c8da582e412f21e2c90393b3d6efe0e53ed082a1 100644 (file)
--- a/gDesklets.spec
+++ b/gDesklets.spec
@@ -10,7 +10,8 @@ Source0:      http://gdesklets.org/files/%{name}-%{version}.tar.bz2
 # Source0-md5: 61644df16206ce8797757ab306badd28
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-plugin_registry.patch
-URL:           http://gdesklets.gnomedesktop.org/
+Patch2:                install-duplicate.patch
+URL:           http://gdesklets.de/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -34,8 +35,8 @@ 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-gconf >= 2.12.4
 Requires:      python-gnome-ui >= 2.12.4
 Requires:      python-pygtk-gtk >= 2:2.8.6
 Requires:      python-pyorbit >= 2.14.0
@@ -51,6 +52,7 @@ gDesklets udostępnia zaawansowaną architekturę dla apletów.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -65,8 +67,7 @@ gDesklets udostępnia zaawansowaną architekturę dla apletów.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/gdesklets/{Sensors,Displays}
-
-%{__make} install \
+%{__make} install -j1 \
        DESTDIR=$RPM_BUILD_ROOT \
        mimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes \
        UPDATE_DESKTOP_DATABASE= \
@@ -86,15 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database_post
-umask 022
-update-mime-database %{_datadir}/mime ||:
+%update_mime_database
 
 %postun
 %update_desktop_database_postun
-if [ $1 = 0 ]; then
-       umask 022
-       update-mime-database %{_datadir}/mime
-fi
+%update_mime_database
 
 %files -f gdesklets.lang
 %defattr(644,root,root,755)

diff --git a/install-duplicate.patch b/install-duplicate.patch
new file mode 100644 (file)
index 0000000..5de4b5b
--- /dev/null
+++ b/install-duplicate.patch
@@ -0,0 +1,12 @@
+install(1) does not like file listed twice on commandline
+
+--- gDesklets-0.36.2/config/Makefile.am~       2008-12-30 16:55:54.000000000 +0200
++++ gDesklets-0.36.2/config/Makefile.am        2011-01-17 10:42:51.178674034 +0200
+@@ -23,7 +23,6 @@
+       ConfigDialog.py   \
+       ConfigWidget.py   \
+       ConfigManager.py  \
+-      ConfigWidget.py   \
+       DaemonConfigger.py  \
+       DisplayConfigger.py \
+       StateSaver.py     \