SPECS: ncurses.spec - ugly workaround to fix broken directory deps...

[hawk]

Author: hawk                         Date: Sat Feb 16 15:52:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ugly workaround to fix broken directory deps:
    error: ncurses-ada-devel-5.6-4: req /usr/lib/ada/adainclude not found
    error: ncurses-ada-devel-5.6-4: req /usr/lib/ada/adalib not found
- release 5

---- Files affected:
SPECS:
   ncurses.spec (1.166 -> 1.167) 

---- Diffs:

================================================================
Index: SPECS/ncurses.spec
diff -u SPECS/ncurses.spec:1.166 SPECS/ncurses.spec:1.167
--- SPECS/ncurses.spec:1.166	Fri May 18 18:21:02 2007
+++ SPECS/ncurses.spec	Sat Feb 16 16:52:17 2008
@@ -17,7 +17,7 @@
 Summary(uk.UTF-8):	ncurses - нова бібліотека керування терміналами
 Name:		ncurses
 Version:	5.6
-Release:	4
+Release:	5
 License:	distributable
 Group:		Libraries
 Source0:	ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz
@@ -300,6 +300,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe do biblioteki Ada95 ncurses
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+%requires_eq	gcc-ada
 
 %description ada-devel
 This package includes the header files and libraries necessary to
@@ -333,6 +334,8 @@
 
 %build
 unset TERMINFO || :
+gcc_target=$(gcc -dumpmachine)
+gcc_version=$(gcc -dumpversion)
 CFLAGS="%{rpmcflags} -DPURE_TERMINFO -D_FILE_OFFSET_BITS=64"
 cp -f /usr/share/automake/config.sub .
 for t in narrowc widec; do
@@ -356,8 +359,8 @@
 	--with-manpage-aliases \
 	--with-manpage-format=normal \
 	--without-manpage-symlinks \
-	--with-ada-include=%{_libdir}/ada/adainclude/ \
-	--with-ada-objects=%{_libdir}/ada/adalib/ \
+	--with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
+	--with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
 	`[ "$t" != "widec" ] && echo --with-termlib=tinfo` \
 	`[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w`
 %{__make} \
@@ -560,8 +563,8 @@
 %files ada-devel
 %defattr(644,root,root,755)
 %doc Ada95/{README,TODO}
-%{_libdir}/ada/adainclude/*
-%{_libdir}/ada/adalib/*
+%{_libdir}/gcc/*/*/adainclude/*
+%{_libdir}/gcc/*/*/adalib/*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -570,6 +573,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167  2008-02-16 15:52:17  hawk
+- ugly workaround to fix broken directory deps:
+    error: ncurses-ada-devel-5.6-4: req /usr/lib/ada/adainclude not found
+    error: ncurses-ada-devel-5.6-4: req /usr/lib/ada/adalib not found
+- release 5
+
 Revision 1.166  2007-05-18 16:21:02  sparky
 - don't use full ftp path in patches, those aren't there anyway
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ncurses.spec?r1=1.166&r2=1.167&f=u