[libexplain] Update to upstream 0.47.D001.

Eric Smith brouhaha at fedoraproject.org
Sun Oct 9 04:05:52 UTC 2011


commit a42a20aa214f9b0f45bc659bfffd27034faec06a
Author: Eric Smith <eric at brouhaha.com>
Date:   Sat Oct 8 21:05:48 2011 -0700

    Update to upstream 0.47.D001.

 .gitignore                |    1 +
 libexplain-skiptest.patch |  115 ---------------------------------------------
 libexplain.spec           |   36 ++++++++------
 sources                   |    2 +-
 4 files changed, 23 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91aac6d..9091168 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libexplain-0.40.D001.tar.gz
+/libexplain-0.47.D001.tar.gz
diff --git a/libexplain.spec b/libexplain.spec
index 9a69caa..e8da59c 100644
--- a/libexplain.spec
+++ b/libexplain.spec
@@ -1,18 +1,14 @@
 Name:           libexplain
-Version:        0.40.D001
-Release:        2%{?dist}
+Version:        0.47.D001
+Release:        1%{?dist}
 Summary:        Library functions to explain system call errors
 URL:            http://libexplain.sourceforge.net
 
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Some tests fail because getmntent() fails in a mock chroot environment,
-# presumably due to the absence of /etc/mtab.  Skip those tests.
-Patch0:         libexplain-skiptest.patch
-
 License:        LGPLv3+
 Group:          System Environment/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  bison libcap-devel libtool groff gettext
 
 %description
@@ -51,7 +47,19 @@ Development files for the libexplain library.
 
 # Some tests fail because getmntent() fails in a mock chroot environment,
 # presumably due to the absence of /etc/mtab.  Skip those tests.
-%patch -P 0 -p1 -b .skiptest
+# Note that Makefile.in is automatically generated upstream, and if we
+# use a patch against it, the patch will usually break with each new
+# upstream release.  Instead we use sed to patch it.
+
+#for t in t0039a t0040a t0041a t0042a t0109a t0110a t0114a t0116a t0128a \
+#         t0141a t0160a t0177a t0190a t0191a t0211a t0213a t0214a t0266a \
+#         t0275a t0276a t0277a t0363a t0523a
+
+%define skiptests t0461a t0462a t0463a
+for t in %{skiptests}
+do
+  sed -i "s/\([ \t]\)$t\([ \t]\)/\1/g" Makefile.in
+done
 
 %build
 ./configure --disable-static \
@@ -65,7 +73,6 @@ make CFLAGS="%{optflags}" \
 make check
 
 %install
-rm -rf %{buildroot}
 # The install target is not smp-safe, so don't use smp_mflags.
 make DESTDIR=%{buildroot} \
      install
@@ -74,31 +81,30 @@ chmod 755 %{buildroot}%{_libdir}/%{name}.so.*.*.*
 # Get rid of the static library and libtool archives
 rm %{buildroot}%{_libdir}/%{name}.{a,la}
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_libdir}/%{name}.so.*
 %doc README LICENSE
 
 %files -n explain
-%defattr(-,root,root,-)
 %{_bindir}/explain
 %{_mandir}/man1/*.1.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_mandir}/man3/*.3.*
 %{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 08 2011 Eric Smith <eric at brouhaha.com> - 0.47.D001-1
+- Updated to latest upstream.
+- Changed Patch0 to use of sed to better deal with new upstream releases.
+- Removed BuildRoot, clean, defattr, etc.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40.D001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a7ac9b3..45ff898 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7530e6f5886ffee062f89ff283884ea0  libexplain-0.40.D001.tar.gz
+7d93acdb0e998ac52270b92e161bc587  libexplain-0.47.D001.tar.gz


More information about the scm-commits mailing list