[gnatcoll] Fix gpr path

[Pavel Zhukov]

commit 1f4c99d3cef15e36aaee83b220107c34a244a9f8
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Tue Jul 17 11:56:51 2012 +0400

    Fix gpr path

 gnatcoll-2012-destdir.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 gnatcoll.spec               |    9 ++++++---
 2 files changed, 48 insertions(+), 3 deletions(-)
---
diff --git a/gnatcoll-2012-destdir.patch b/gnatcoll-2012-destdir.patch
new file mode 100644
index 0000000..f93168b
--- /dev/null
+++ b/gnatcoll-2012-destdir.patch
@@ -0,0 +1,42 @@
+--- a/Makefile	2012-07-17 11:27:16.291596708 +0400
++++ b/Makefile	2012-07-17 11:27:44.800595858 +0400
+@@ -91,7 +91,7 @@
+ install_library_type:
+ 	${MKDIR} ${bindir}
+ 	${MKDIR} ${libdir}/${TARNAME}/${LIBRARY_TYPE}
+-	${MKDIR} ${DESTDIR}${prefix}/lib/gnat/${TARNAME}
++	${MKDIR} ${DESTDIR}${projectdir}/${TARNAME}
+ 	${MKDIR} ${datadir}/examples
+ 	${MKDIR} ${datadir}/gnatcoll
+ 	${MKDIR} ${includedir}/${TARNAME}
+@@ -111,7 +111,7 @@
+ 	${CP} src/dborm.py ${datadir}/gnatcoll/
+ 	${CP} distrib/gnatcoll_gps.xml ${datadir}/gps/plug-ins
+ 	${CP} distrib/gnatcoll_runtime.xml ${datadir}/gps/plug-ins
+-	${CP} distrib/*.gpr ${DESTDIR}${prefix}/lib/gnat
++	${CP} distrib/*.gpr ${DESTDIR}${projectdir}/
+ 
+ install_docs:
+ 	${MKDIR} ${datadir}/doc/gnatcoll/html
+--- a/Makefile.conf.in	2012-07-17 11:27:47.783595765 +0400
++++ b/Makefile.conf.in	2012-07-17 11:28:39.584594273 +0400
+@@ -43,6 +43,7 @@
+ bindir=${DESTDIR}@bindir@
+ libdir=${DESTDIR}@libdir@
+ includedir=${DESTDIR}@includedir@
++projectdir ?= ${prefix}/lib/gnat
+ 
+ MKDIR=mkdir -p
+ CP=cp -p
+@@ -151,9 +152,9 @@
+ installsources:
+ 	@${CP} -p ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}} ${includedir}/${TARNAME}
+ ifeq (${OS},Windows_NT)
+-	@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${DESTDIR}${prefix}/lib/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
++	@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${DESTDIR}${projectdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
+ else
+-	@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}${prefix}/lib/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
++	@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}${projectdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
+ endif
+ 
+ force:
diff --git a/gnatcoll.spec b/gnatcoll.spec
index 27d5e79..08ef9e3 100644
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@ -1,6 +1,6 @@
 Name:        gnatcoll    
 Version:    2012
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Suite of reusable software components and utilities
 Group:      System Environment/Libraries
 License:    GPLv2+
@@ -9,6 +9,7 @@ URL:        http://libre.adacore.com
 Source0:    %{name}-gpl-%{version}-src.tgz 
 Patch1:     %{name}-%{version}-directories.patch
 Patch2:     %{name}-%{version}-optflags.patch
+Patch3:     %{name}-%{version}-destdir.patch
 BuildRequires:   fedora-gnat-project-common >= 2 
 BuildRequires:   python-devel gmp-devel GtkAda-devel
 BuildRequires:   pygtk2-devel postgresql-devel chrpath
@@ -37,6 +38,7 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 %setup -q -n %{name}-gpl-%{version}-src
 %patch1 -p1
 %patch2 -p1 
+%patch3 -p1
 
 %build
 %configure --enable-shared
@@ -50,7 +52,7 @@ make ##%%%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-export gprdir=%_GNAT_project_dir
+export projectdir=%_GNAT_project_dir
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/%{_libdir}/%{name}/static/*
 rm -rf %{buildroot}/%{_datadir}/gps
@@ -92,9 +94,10 @@ rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
 
 
 %changelog
-* Tue Jul 17 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-2
+* Tue Jul 17 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-3
 - Update to 2012
 - Fix library type in gpr
+- Fix project files path
 
 * Sun Mar 10 2012  Pavel Zhukov <landgraf at fedoraproject.org> - 2011-8
 - Rebuild for new gprbuild