[zeromq-ada] Fix libs directory Add PREFIX because of usrmove

[Pavel Zhukov]

commit ebf6c06fa848a80ff6915e2137b883963ef6396d
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Sun Sep 23 20:17:32 2012 +0400

    Fix libs directory
    Add PREFIX because of usrmove

 zeromq-ada-libdir.patch |   15 ++++++++++++++-
 zeromq-ada.spec         |   12 +++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/zeromq-ada-libdir.patch b/zeromq-ada-libdir.patch
index b217d38..a8d6ac3 100644
--- a/zeromq-ada-libdir.patch
+++ b/zeromq-ada-libdir.patch
@@ -14,7 +14,20 @@
  	mkdir -p ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada
  	cp examples/zmq-examples*.ad* ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada
  	cp examples/zmq-examples.gpr.inst ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada/zmq-examples.gpr
-+	cd  ${DESTDIR}/${LIBDIR}/zmq/relocatable/ && ln -s *.so* ../../
++	cd  ${DESTDIR}/${LIBDIR}/ && ln -s zmq/relocatable/libzmqAda.so* . 
  all: compile install
  
  samples:
+
+
+## Usr move 
+--- a/Makefile	2012-09-23 20:15:19.594222947 +0400
++++ b/Makefile	2012-09-23 20:15:33.392222537 +0400
+@@ -1,6 +1,6 @@
+ 
+ ifndef PREFIX
+-  PREFIX=$(dir $(shell dirname `which gnatls`))
++  PREFIX=/usr
+ endif
+ LIBDIR ?= ${PREFIX}/lib
+ DESTDIR ?= 
diff --git a/zeromq-ada.spec b/zeromq-ada.spec
index 4f7cdbc..61321d2 100644
--- a/zeromq-ada.spec
+++ b/zeromq-ada.spec
@@ -2,7 +2,7 @@
 
 Name:       zeromq-ada
 Version:    2.1.0
-Release:    9.24032011git%{?dist}
+Release:    8.24032011git%{?dist}
 Summary:    Ada binding for zeromq
 Group:      System Environment/Libraries
 License:    GPLv2+
@@ -46,7 +46,7 @@ make %{?_smp_mflags}  GNATFLAGS="%{GNAT_optflags}"
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_DIR=%{_GNAT_project_dir}  GNATFLAGS="%{GNAT_optflags}"
+make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_PATH=%{_GNAT_project_dir}  GNATFLAGS="%{GNAT_optflags}"
 rm -f %{buildroot}/%{_libdir}/zmq/static/libzmqAda.a
 rm -rf %{buildroot}/%{_libdir}/zmq/static
 chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version}
@@ -76,11 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version}
 %{_datadir}/zmq/*
 
 %changelog
-* Mon Jul 23 2012  Pavel Zhukov <landgraf at fedoraproject.org> - 2.1.0-9.24032011git
-- Fix project dir 
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-8.24032011git
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Sun Sep 23 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2.1.0-8.24032011git
+- Fix libraries symlinks
+- Add usrmove patch
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-7.24032011git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild