[packages/pHash] .la not needed when .pc present
glen
glen at pld-linux.org
Mon Nov 9 21:12:03 CET 2015
commit e435248f045fb6faccee4808b703e44d5aaaa11a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Nov 9 22:11:53 2015 +0200
.la not needed when .pc present
pHash.spec | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/pHash.spec b/pHash.spec
index f929dd5..7bcb460 100644
--- a/pHash.spec
+++ b/pHash.spec
@@ -74,12 +74,14 @@ Statyczna biblioteka pHash.
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp examples/*.cpp $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# obsoleted by .pc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpHash.la
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p examples/*.cpp $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -96,7 +98,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpHash.so
-%{_libdir}/libpHash.la
%{_includedir}/*.h
%{_pkgconfigdir}/pHash.pc
%{_examplesdir}/%{name}-%{version}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pHash.git/commitdiff/e435248f045fb6faccee4808b703e44d5aaaa11a
More information about the pld-cvs-commit
mailing list