[shared-mime-info/f20] PKGSYSTEM_ENABLE_FSYNC default on, adapt to new style scriptlet

Rex Dieter rdieter at fedoraproject.org
Wed Jul 2 18:23:34 UTC 2014


commit 9def3530bbd4aa53275601f8919da485ade244c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jul 2 13:23:43 2014 -0500

    PKGSYSTEM_ENABLE_FSYNC default on, adapt to new style scriptlet

 shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch |    2 +-
 shared-mime-info.spec                             |   13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch b/shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch
index f86ccde..be81f4b 100644
--- a/shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch
+++ b/shared-mime-info-1.2-PKGSYSTEM_ENABLE_FSYNC.patch
@@ -14,7 +14,7 @@ diff -up shared-mime-info-1.2/update-mime-database.c.PKGSYSTEM_FSYNC shared-mime
  
  #ifdef HAVE_FDATASYNC
 +	enable_fsync = g_getenv("PKGSYSTEM_ENABLE_FSYNC");
-+	if (enable_fsync && atoi(enable_fsync)) {
++	if (!enable_fsync || atoi(enable_fsync)) {
  	fd = open(pathname, O_RDONLY);
  	if (fd == -1)
  	{
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index aeff427..3e94c66 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.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -56,6 +56,8 @@ and looking up the correct MIME type in a database.
 make
 
 %install
+# speed build a bit
+PKGSYSTEM_ENABLE_FSYNC=0 \
 make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT%{_datadir}/mime -type d \
@@ -74,8 +76,10 @@ cat %SOURCE4 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 
 %post
-# Should fail, as it would mean a problem in the mime database
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
+touch --no-create %{_datadir}/mime/packages ||:
+
+%posttrans
+%{_bindir}/update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -89,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 02 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2-7
+- PKGSYSTEM_ENABLE_FSYNC default on, adapt to new style scriptlet
+
 * Fri Jun 27 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2-6
 - allow (but ignore) new -n option
 


More information about the scm-commits mailing list