[libbsd] Update to latest upstream.

Eric Smith brouhaha at fedoraproject.org
Mon Jun 4 00:00:24 UTC 2012


commit 63f079b9c3cf456d8539694adceb9f85ff66d549
Author: Eric Smith <eric at brouhaha.com>
Date:   Sun Jun 3 17:04:25 2012 -0700

    Update to latest upstream.

 .gitignore  |    1 +
 libbsd.spec |   20 ++++++++++----------
 sources     |    2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75ec4e0..2515e99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libbsd-0.2.0.tar.gz
 /libbsd-0.3.0.tar.gz
+/libbsd-0.4.1.tar.gz
diff --git a/libbsd.spec b/libbsd.spec
index 63589a7..a722a5f 100644
--- a/libbsd.spec
+++ b/libbsd.spec
@@ -1,6 +1,6 @@
 Name:		libbsd
-Version:	0.3.0
-Release:	2%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Library providing BSD-compatible functions for portability
 URL:		http://libbsd.freedesktop.org/
 
@@ -28,12 +28,14 @@ Development files for the libbsd library.
 %setup -q
 
 # fix encoding of flopen.3 man page
-for f in src/flopen.3; do
+for f in man/flopen.3; do
   iconv -f iso8859-1 -t utf-8 $f >$f.conv
   touch -r $f $f.conv
   mv $f.conv $f
 done
 
+%configure
+
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags} \
      libdir=%{_libdir} \
@@ -47,13 +49,9 @@ make libdir=%{_libdir} \
      DESTDIR=%{buildroot} \
      install
 
-# don't want static library
+# don't want static library or libtool archive
 rm %{buildroot}%{_libdir}/%{name}.a
-
-# Move nlist.h into bsd directory to avoid conflict with elfutils-libelf.
-# Anyone that wants that functionality should really used elfutils-libelf
-# instead.
-mv %{buildroot}%{_includedir}/nlist.h %{buildroot}%{_includedir}/bsd/
+rm %{buildroot}%{_libdir}/%{name}.la
 
 %post -p /sbin/ldconfig
 
@@ -66,13 +64,15 @@ mv %{buildroot}%{_includedir}/nlist.h %{buildroot}%{_includedir}/bsd/
 %files devel
 %{_mandir}/man3/*.3.gz
 %{_mandir}/man3/*.3bsd.gz
-%{_includedir}/*.h
 %{_includedir}/bsd
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}-overlay.pc
 
 %changelog
+* Sun Jun 03 2012 Eric Smith <eric at brouhaha.com> - 0.4.1-1
+- Update to latest upstream release.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index fcab3c2..607d672 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-833e58531b4bd84b119b53d834d8e0d8  libbsd-0.3.0.tar.gz
+8632bd9c56887f7f83cec2864937303d  libbsd-0.4.1.tar.gz


More information about the scm-commits mailing list