diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index ea420bb..07ade92 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,8 @@ Version: 0.15 Release: 3%{?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 +Source1: desktop_mime_type.prov +Source2: macros.desktop_mime_type # https://bugs.freedesktop.org/show_bug.cgi?id=12018 License: GPLv2+ Group: Development/Tools @@ -33,7 +34,8 @@ 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 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop_mime_type.prov +install -m0755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.desktop_mime_type %clean rm -rf $RPM_BUILD_ROOT @@ -43,9 +45,15 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README NEWS %{_bindir}/* %{_datadir}/emacs/site-lisp/ -%{_libdir}/rpm/desktop-mime-type.prov +%{_libdir}/rpm/desktop_mime_type.prov +%{_sysconfdir}/rpm/macros.desktop_mime_type %changelog +* 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 + this new functionality. + * Fri May 02 2008 Richard Hughes - 0.15-3 - Add desktop-mime-type.prov so that we can automatically generate mimetype provides for packages at build time. diff --git a/desktop-mime-type.prov b/desktop_mime_type.prov similarity index 100% rename from desktop-mime-type.prov rename to desktop_mime_type.prov diff --git a/macros.desktop_mime_type b/macros.desktop_mime_type new file mode 100644 index 0000000..d377616 --- /dev/null +++ b/macros.desktop_mime_type @@ -0,0 +1 @@ +%__desktop_mime_type_provides /usr/lib/rpm/desktop_mime_type.prov