rpms/GtkAda/devel GtkAda.spec,1.19,1.20

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781/devel

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GtkAda.spec	21 Oct 2006 20:07:03 -0000	1.19
+++ GtkAda.spec	21 Oct 2006 22:42:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	6%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -39,7 +39,8 @@
 
 %prep
 %setup -q -n %{name}-gpl-%{version}
-
+sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
+sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 
 %build
 # adapt opt flags to gnatmake
@@ -47,13 +48,13 @@
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall incdir=$RPM_BUILD_ROOT%{_includedir}/gtkada alidir=$RPM_BUILD_ROOT%{_libdir}/gtkada
 (make -C docs install prefix=$PWD/doc-install)
 
 # move shared libraries to standard place
@@ -62,7 +63,6 @@
 
 # make libraries executables, otherwise dependencies are not found
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 (cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
@@ -97,6 +97,7 @@
 %{_libdir}/gtkada
 %{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*
 %{_datadir}/gps
 %{_mandir}/man*/*
@@ -106,7 +107,7 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-5
 - new version 2.8.0
 
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-13