[liblo] Don't build include the example Makefile*. They cause multilib conflict#480403
Orcan Ogetbil
oget at fedoraproject.org
Wed Jun 13 01:56:29 UTC 2012
commit e013b37b032b5d2055320da72608a203a7d0d8b2
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Tue Jun 12 21:56:26 2012 -0400
Don't build include the example Makefile*. They cause multilib conflict#480403
- Specfile cleanup
liblo.spec | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/liblo.spec b/liblo.spec
index e9ec352..b757c1f 100644
--- a/liblo.spec
+++ b/liblo.spec
@@ -1,14 +1,13 @@
Summary: Open Sound Control library
Name: liblo
Version: 0.26
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://liblo.sourceforge.net
Source0: http://download.sf.net/sourceforge/liblo/liblo-%{version}.tar.gz
# Fix multilib installation issue RHBZ#480403
Patch0: liblo-no-date-footer.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
@@ -19,8 +18,7 @@ POSIX systems developed by Steve Harris.
%package devel
Summary: Libraries, includes, etc to develop liblo applications
Group: Development/Libraries
-Requires: liblo = %{version}-%{release}
-Requires: pkgconfig
+Requires: liblo%{?_isa} = %{version}-%{release}
%description devel
Libraries, include files, etc you can use to develop liblo
@@ -30,9 +28,6 @@ based Open Sound Control applications.
%setup -q
%patch0 -p1 -b .nodate
-# Don't build examples
-sed -i 's|examples||' Makefile.in
-
%build
%configure --enable-ipv6 --disable-static
# We don't want rpath
@@ -42,37 +37,38 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%make_install
# install man pages by hand
mkdir -p %{buildroot}%{_mandir}/man3/
install -m 0664 doc/man/man3/*.3 %{buildroot}%{_mandir}/man3/
-%clean
-rm -rf %{buildroot}
+# remove libtool archives
+rm -f %{buildroot}%{_libdir}/liblo.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_libdir}/liblo.so.*
%{_bindir}/oscdump
%{_bindir}/oscsend
%files devel
-%defattr(-,root,root)
%exclude %{_libdir}/liblo.la
-%doc doc/html examples
+%doc doc/html examples/*.c
%{_libdir}/liblo.so
%{_includedir}/lo
%{_libdir}/pkgconfig/liblo.pc
%{_mandir}/man3/*
%changelog
+* Tue Jun 12 2012 Orcan Ogetbil <oget [dot] fedora [at] gmail [dot] com> - 0.26-4
+- Don't build include the example Makefile*. They cause multilib conflict#480403
+- Specfile cleanup
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list