diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 07ade92..b9f2649 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.15 -Release: 3%{?dist} +Release: 5%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz -Source1: desktop_mime_type.prov -Source2: macros.desktop_mime_type +Source1: desktop-file.prov # https://bugs.freedesktop.org/show_bug.cgi?id=12018 License: GPLv2+ Group: Development/Tools @@ -34,8 +33,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # add the provides script -install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop_mime_type.prov -install -m0755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.desktop_mime_type +install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop-file.prov %clean rm -rf $RPM_BUILD_ROOT @@ -45,10 +43,13 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README NEWS %{_bindir}/* %{_datadir}/emacs/site-lisp/ -%{_libdir}/rpm/desktop_mime_type.prov -%{_sysconfdir}/rpm/macros.desktop_mime_type +%{_libdir}/rpm/desktop-file.prov %changelog +* Wed Feb 04 2009 Richard Hughes - 0.15-5 +- Panu merged the rpm bits for this feature, but we've got a new provides + filename. Respin this package with the new name. + * Thu Jan 22 2009 Richard Hughes - 0.15-4 - Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny macros.desktop_mime_type file so that we can trivially patch rpm to enable diff --git a/desktop_mime_type.prov b/desktop-file.prov similarity index 100% rename from desktop_mime_type.prov rename to desktop-file.prov diff --git a/macros.desktop_mime_type b/macros.desktop_mime_type deleted file mode 100644 index d377616..0000000 --- a/macros.desktop_mime_type +++ /dev/null @@ -1 +0,0 @@ -%__desktop_mime_type_provides /usr/lib/rpm/desktop_mime_type.prov