From: ekenny <>
Date: Thu, 23 Oct 2008 12:13:29 +0000 (+0000)
Subject: Updated to use %{_lib} instead of lib for x86_64 machines
X-Git-Tag: test_tag~112
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2d7646a22a3f2234ee0c409735605dbcc32c2970;p=jra1mw.git

Updated to use %{_lib} instead of lib for x86_64 machines
---

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 4491c2b..05555c9 100755
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -191,13 +191,18 @@ fi
 %files devel
 %attr(-, root, root) %{prefix}/include/gridsite.h
 %attr(-, root, root) %{prefix}/include/gridsite-gacl.h
+<<<<<<< make-gridsite-spec
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite.a
+%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.a
+=======
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite.a
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.a
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.a
+>>>>>>> 1.17
 
 %files apache
 %attr(-, root, root) %{prefix}/share/man/man8/mod_gridsite.8.gz
-%attr(-, root, root) %{prefix}/lib/httpd/modules/mod_gridsite.so
+%attr(-, root, root) %{prefix}/%{_lib}/httpd/modules/mod_gridsite.so
 %attr(-, root, root) %{prefix}/sbin/real-gridsite-admin.cgi
 %attr(-, root, root) %{prefix}/sbin/gridsite-copy.cgi
 %attr(-, root, root) %{prefix}/sbin/gridsite-storage.cgi