From 49acc19f78939fe7c0392ec67d6a974a7bc2a2ce Mon Sep 17 00:00:00 2001
From: Eric Smith <brouhaha@fedoraproject.org>
Date: Wed, 10 Feb 2010 01:03:26 +0000
Subject: [PATCH] - changes based on review by Sebastian Dziallas

---
 .cvsignore             |  1 +
 import.log             |  1 +
 libbsd-debuginfo.patch | 12 +++++
 libbsd.spec            | 99 ++++++++++++++++++++++++++++++++++++++++++
 sources                |  1 +
 5 files changed, 114 insertions(+)
 create mode 100644 import.log
 create mode 100644 libbsd-debuginfo.patch
 create mode 100644 libbsd.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..0526908 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+libbsd-0.2.0.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..91a8bf2
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+libbsd-0_2_0-3_fc12:HEAD:libbsd-0.2.0-3.fc12.src.rpm:1265763719
diff --git a/libbsd-debuginfo.patch b/libbsd-debuginfo.patch
new file mode 100644
index 0000000..b9d6c17
--- /dev/null
+++ b/libbsd-debuginfo.patch
@@ -0,0 +1,12 @@
+diff -up libbsd-0.2.0/Makefile.makefile libbsd-0.2.0/Makefile
+--- libbsd-0.2.0/Makefile.makefile	2010-01-28 19:41:22.000000000 -0800
++++ libbsd-0.2.0/Makefile	2010-01-28 19:42:59.000000000 -0800
+@@ -149,7 +149,7 @@ $(LIB_SONAME): $(LIB_SHARED)
+ 	ln -fs $^ $@
+ 
+ $(LIB_SHARED): $(LIB_SHARED_OBJS)
+-	gcc -shared \
++	gcc $(CFLAGS) -shared \
+ 	  -Wl,-soname -Wl,$(LIB_SONAME) \
+ 	  -Wl,--version-script=Versions \
+ 	  -o $@ $^
diff --git a/libbsd.spec b/libbsd.spec
new file mode 100644
index 0000000..2d57ac0
--- /dev/null
+++ b/libbsd.spec
@@ -0,0 +1,99 @@
+Name:		libbsd
+Version:	0.2.0
+Release:	3%{?dist}
+Summary:	Library providing BSD-compatible functions for portability
+URL:		http://libbsd.freedesktop.org/
+
+Source0:	http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.gz
+
+# Patch to use $(CFLAGS) when linking shared library, necessary to
+# get debuginfo package.  Upstream bug 
+# https://bugs.freedesktop.org/show_bug.cgi?id=26310
+Patch0:		libbsd-debuginfo.patch
+
+License:	BSD and ISC and Copyright only and Public Domain
+Group:		System Environment/Libraries
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+libbsd provides useful functions commonly found on BSD systems, and
+lacking on others like GNU systems, thus making it easier to port
+projects with strong BSD origins, without needing to embed the same
+code over and over again on each project.
+
+%package devel
+Summary:	Development files for libbsd
+Group:		Development/Libraries
+Requires:	libbsd = %{version}-%{release}
+Requires:	pkgconfig
+
+%description devel
+Development files for the libbsd library.
+
+%prep
+%setup -q
+%patch0 -p1 -b .debuginfo
+
+# fix encoding of flopen.3 man page
+for f in src/flopen.3; do
+  iconv -f iso8859-1 -t utf-8 $f >$f.conv
+  touch -r $f $f.conv
+  mv $f.conv $f
+done
+
+%build
+make CFLAGS="%{optflags}" %{?_smp_mflags} \
+     libdir=%{_libdir} \
+     usrlibdir=%{_libdir} \
+     exec_prefix=%{_prefix}
+
+%install
+rm -rf %{buildroot}
+make libdir=%{_libdir} \
+     usrlibdir=%{_libdir} \
+     exec_prefix=%{_prefix} \
+     DESTDIR=%{buildroot} \
+     install
+
+# don't want static library
+rm %{buildroot}%{_libdir}/%{name}.a
+
+# Shared library needs to be executable for debuginfo to be generated
+# Upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=26312
+chmod 755 %{buildroot}%{_libdir}/%{name}.so.%{version}
+
+# 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/
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc README TODO ChangeLog
+%{_libdir}/%{name}.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_mandir}/man3/*.3.gz
+%{_mandir}/man3/*.3bsd.gz
+%{_includedir}/*.h
+%{_includedir}/bsd
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+%changelog
+* Fri Jan 29 2010 Eric Smith <eric@brouhaha.com> - 0.2.0-3
+- changes based on review by Sebastian Dziallas
+
+* Fri Jan 29 2010 Eric Smith <eric@brouhaha.com> - 0.2.0-2
+- changes based on review comments by Jussi Lehtola and Ralf Corsepious
+
+* Thu Jan 28 2010 Eric Smith <eric@brouhaha.com> - 0.2.0-1
+- initial version
diff --git a/sources b/sources
index e69de29..9a74369 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c6d5413e76949b14e4bf13258e63d355  libbsd-0.2.0.tar.gz