Author: glen Date: Mon Jan 17 08:47:44 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix duplicate file install, force -j1 on install
- use update_mime_database macro
---- Files affected:
packages/gDesklets:
gDesklets.spec (1.75 -> 1.76) , install-duplicate.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gDesklets/gDesklets.spec
diff -u packages/gDesklets/gDesklets.spec:1.75
packages/gDesklets/gDesklets.spec:1.76
--- packages/gDesklets/gDesklets.spec:1.75 Mon Feb 25 17:58:29 2008
+++ packages/gDesklets/gDesklets.spec Mon Jan 17 09:47:38 2011
@@ -11,7 +11,8 @@
# 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
@@ -35,8 +36,8 @@
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
@@ -52,6 +53,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -66,8 +68,7 @@
%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= \
@@ -87,15 +88,11 @@
%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)
@@ -217,6 +214,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.76 2011/01/17 08:47:38 glen
+- fix duplicate file install, force -j1 on install
+- use update_mime_database macro
+
Revision 1.75 2008/02/25 16:58:29 megabajt
- install icons to hicolor directory not to gnome
- release 0.2
================================================================
Index: packages/gDesklets/install-duplicate.patch
diff -u /dev/null packages/gDesklets/install-duplicate.patch:1.1
--- /dev/null Mon Jan 17 09:47:44 2011
+++ packages/gDesklets/install-duplicate.patch Mon Jan 17 09:47:39 2011
@@ -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 \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gDesklets/gDesklets.spec?r1=1.75&r2=1.76&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
