[nacl] The cpucycles.o and randombytes.o moved outside the archive

Jaroslav Škarvada jskarvad at fedoraproject.org
Mon Aug 19 09:39:54 UTC 2013


commit c9b5ccd0f3b73506dccbc1c332350518d0607378
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Aug 19 11:39:18 2013 +0200

    The cpucycles.o and randombytes.o moved outside the archive

 nacl.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/nacl.spec b/nacl.spec
index ecc74cd..5ef7a54 100644
--- a/nacl.spec
+++ b/nacl.spec
@@ -2,7 +2,7 @@ Name:           nacl
 # http://nacl.cr.yp.to/
 URL:            http://nacl.cace-project.eu/
 Version:        20110221
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Public Domain
 Group:          Development/Libraries
 Summary:        Networking and Cryptography library
@@ -54,8 +54,8 @@ install -m 0644 -t %{buildroot}%{_includedir}/%{name} build/fedora/include/*/*.h
 mkdir -p %{buildroot}%{_libdir}/
 install -m 0644 -t %{buildroot}%{_libdir} build/fedora/lib/*/*.a
 
-# add cpucycles.o and randombytes.o to libnacl.a
-ar -r %{buildroot}%{_libdir}/libnacl.a build/fedora/lib/*/cpucycles.o build/fedora/lib/*/randombytes.o
+# install cpucycles.o and randombytes.o
+install -m 0644 -t %{buildroot}%{_libdir} build/fedora/lib/*/cpucycles.o build/fedora/lib/*/randombytes.o
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -m 0644 -t %{buildroot}%{_mandir}/man1 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
@@ -69,10 +69,15 @@ install -m 0755 -t %{buildroot}%{_bindir} build/fedora/bin/*
 
 %files devel
 %{_libdir}/libnacl.a
+%{_libdir}/cpucycles.o
+%{_libdir}/randombytes.o
 %dir %{_includedir}/nacl
 %{_includedir}/nacl/*
 
 %changelog
+* Mon Aug 19 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 20110221-8
+- The cpucycles.o and randombytes.o moved outside the archive
+
 * Thu Aug  8 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 20110221-7
 - Added cpucycles.o and randombytes.o to libnacl.a archive
   Resolves: rhbz#994236


More information about the scm-commits mailing list