[shared-mime-info] fix #716451
Matthias Clasen
mclasen at fedoraproject.org
Thu Mar 8 01:32:49 UTC 2012
commit f2718c1611cff01b0acaca4407cb8d7494c20ae0
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Mar 7 20:32:49 2012 -0500
fix #716451
shared-mime-info.spec | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 383f4e9..f1191b5 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
Summary: Shared MIME information database
Name: shared-mime-info
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://freedesktop.org/Software/shared-mime-info
@@ -44,14 +44,18 @@ and looking up the correct MIME type in a database.
%build
-%configure --disable-update-mimedb
+%configure
# make %{?_smp_mflags}
make
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT%{_datadir}/mime -type d \
+| sed -e "s|^$RPM_BUILD_ROOT|%%dir |" > %{name}.files
+find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \
+| sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" >> %{name}.files
+
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
@@ -73,20 +77,20 @@ sed -i -e 's|mozilla-firefox.desktop|firefox.desktop|'\
# Should fail, as it would mean a problem in the mime database
%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
+%files -f %{name}.files
%defattr(-,root,root,-)
%doc README NEWS HACKING COPYING shared-mime-info-spec.xml
%{_bindir}/*
-%dir %{_datadir}/mime/
-%{_datadir}/mime/packages
+%{_datadir}/mime/packages/*
%{_datadir}/applications/defaults.list
%{_datadir}/pkgconfig/*
%{_mandir}/man*/*
%changelog
+* Wed Mar 7 2012 Matthias Clasen <mclasen at redhat.com> - 1.0-2
+- Own/%%ghost files generated by update-mime-database from
+ freedesktop.org.xml (patch by Ville Skyttä)
+
* Tue Jan 17 2012 Bastien Nocera <bnocera at redhat.com> 1.0-1
- Update to 1.0
More information about the scm-commits
mailing list