diff --git a/update-desktop-files.changes b/update-desktop-files.changes index 4945d5e..e7718e7 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 6 14:13:56 UTC 2011 - coolo@novell.com + +- ship desktop.attr together with the .prov script for rpm + automatic mimehandler provides + ------------------------------------------------------------------- Wed Jan 26 00:18:33 UTC 2011 - gber@opensuse.org diff --git a/update-desktop-files.spec b/update-desktop-files.spec index e1e57b5..a68579c 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -1,7 +1,7 @@ # -# spec file for package update-desktop-files (Version 11.3) +# spec file for package update-desktop-files # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: update-desktop-files -Version: 11.3 -Release: 6 +Version: 12.1 +Release: 7 Summary: A Build Tool to Update Desktop Files License: GPLv2+ Group: Development/Tools/Building @@ -29,11 +29,12 @@ AutoReqProv: on Source: suse_update_desktop_file.sh Source1: map-desktop-category.sh Source2: macro +Source3: desktop.attr Source100: mimetypes.prov # This is not true technically, but we do that to make the rpm macros from # desktop-file-utils available to most packages that ship a .desktop file # (since they already have a update-desktop-files BuildRequires). -Requires: desktop-file-utils +Requires: desktop-file-utils DOESNOTWORK BuildArch: noarch %description @@ -48,17 +49,17 @@ cd %name %build %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm -install -m 0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/rpm -install -m0755 %SOURCE100 $RPM_BUILD_ROOT/usr/lib/rpm +mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir +install -m0755 %SOURCE0 %SOURCE1 %SOURCE100 $RPM_BUILD_ROOT%_rpmconfigdir install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT/etc/rpm/macros.%name +install -m0644 -D %SOURCE3 $RPM_BUILD_ROOT%_rpmconfigdir/fileattrs/desktop.attr %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/lib/rpm/* +%_rpmconfigdir/* /etc/rpm/* %changelog