[ast] Do not conflict with libast (bug #978262)
Orion Poplawski
orion at fedoraproject.org
Sun Aug 11 22:46:54 UTC 2013
commit fe242aeaae5a3b81514385e18a188d99b3d0459a
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Sun Aug 11 16:46:46 2013 -0600
Do not conflict with libast (bug #978262)
ast.spec | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/ast.spec b/ast.spec
index 80e0bba..c23c341 100644
--- a/ast.spec
+++ b/ast.spec
@@ -1,6 +1,6 @@
Name: ast
Version: 6.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A Library for Handling World Coordinate Systems in Astronomy
Group: System Environment/Libraries
@@ -71,7 +71,8 @@ sed -i -e 's/675 Mass Ave, Cambridge, MA 02139/51 Franklin Street, Fifth Floor,
%build
-%configure --disable-static
+# Do not conflict with libast (bug #978262)
+%configure --disable-static --libdir=%{_libdir}/%{name}
make %{?_smp_mflags}
@@ -79,6 +80,9 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# Setup ld.so.conf.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/%{name} > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}_%{_arch}.conf
# Docs are installed to the wrong location, don't need source
rm -r $RPM_BUILD_ROOT%{_prefix}/docs
rm -r $RPM_BUILD_ROOT%{_datadir}/ast
@@ -86,7 +90,7 @@ rm -r $RPM_BUILD_ROOT%{_prefix}/{help,manifests,news}
# This references an uninstalled library
rm $RPM_BUILD_ROOT%{_bindir}/ast_link_adam
# These reference other libraries
-rm $RPM_BUILD_ROOT%{_libdir}/libast_{drama,ems,pgplot{,3d}}.so*
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libast_{drama,ems,pgplot{,3d}}.so*
%check
@@ -100,18 +104,23 @@ make check
%files
%doc COPYING.LIB LICENCE
-%{_libdir}/*.so.*
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}_%{_arch}.conf
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so.*
%files devel
%{_bindir}/ast_link
%{_includedir}/*
-%{_libdir}/*.so
+%{_libdir}/%{name}/*.so
%files doc
%doc sun210.ps sun211.ps
%changelog
+* Sun Aug 11 2013 Orion Poplawski <orion at cora.nwra.com> 6.0.1-6
+- Do not conflict with libast (bug #978262)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list