diff --git a/.gitignore b/.gitignore index 0526908..75ec4e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libbsd-0.2.0.tar.gz +/libbsd-0.3.0.tar.gz diff --git a/libbsd-debuginfo.patch b/libbsd-debuginfo.patch deleted file mode 100644 index b9d6c17..0000000 --- a/libbsd-debuginfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 index 7269db7..6981572 100644 --- a/libbsd.spec +++ b/libbsd.spec @@ -1,19 +1,13 @@ Name: libbsd -Version: 0.2.0 -Release: 4%{?dist} +Version: 0.3.0 +Release: 1%{?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 @@ -32,7 +26,6 @@ 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 @@ -48,7 +41,6 @@ make CFLAGS="%{optflags}" %{?_smp_mflags} \ exec_prefix=%{_prefix} %install -rm -rf %{buildroot} make libdir=%{_libdir} \ usrlibdir=%{_libdir} \ exec_prefix=%{_prefix} \ @@ -58,39 +50,33 @@ make libdir=%{_libdir} \ # 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 +%doc COPYING 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 +%{_libdir}/pkgconfig/%{name}-overlay.pc %changelog -* Mon Feb 07 2011 Fedora Release Engineering - 0.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Sat Oct 08 2011 Eric Smith - 0.3.0-1 +- Update to latest upstream release. +- Removed Patch0, fixed upstream. +- Removed BuildRoot, clean, defattr. * Fri Jan 29 2010 Eric Smith - 0.2.0-3 - changes based on review by Sebastian Dziallas diff --git a/sources b/sources index 9a74369..fcab3c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6d5413e76949b14e4bf13258e63d355 libbsd-0.2.0.tar.gz +833e58531b4bd84b119b53d834d8e0d8 libbsd-0.3.0.tar.gz