SPECS: db4.2.spec - non-conflicting includedir

[qboosh]

Author: qboosh                       Date: Fri Nov 18 19:40:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- non-conflicting includedir

---- Files affected:
SPECS:
   db4.2.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/db4.2.spec
diff -u SPECS/db4.2.spec:1.73 SPECS/db4.2.spec:1.74
--- SPECS/db4.2.spec:1.73	Fri Nov 18 20:11:37 2005
+++ SPECS/db4.2.spec	Fri Nov 18 20:40:20 2005
@@ -33,6 +33,8 @@
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_includedir	%{_prefix}/include/db4.2
+
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
@@ -287,13 +289,15 @@
 %endif
 
 %{__make} -C build_unix.static library_install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	docdir=%{_docdir}/db-%{version}-docs \
-	DESTDIR=$RPM_BUILD_ROOT
+	includedir=%{_includedir}
 
 %{__make} -C build_unix library_install \
-	docdir=%{_docdir}/db-%{version}-docs \
 	DESTDIR=$RPM_BUILD_ROOT \
-	LIB_INSTALL_FILE_LIST=""
+	LIB_INSTALL_FILE_LIST="" \
+	docdir=%{_docdir}/db-%{version}-docs \
+	includedir=%{_includedir}
 
 cd $RPM_BUILD_ROOT%{_libdir}
 mv -f libdb.a libdb-4.2.a
@@ -339,6 +343,7 @@
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libdb-4.2.la
+%dir %{_includedir}
 %{_includedir}/db.h
 %{_includedir}/db_185.h
 %{_docdir}/db-%{version}-docs/api_c
@@ -411,6 +416,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2005/11/18 19:40:20  qboosh
+- non-conflicting includedir
+
 Revision 1.73  2005/11/18 19:11:37  qboosh
 - updated URLs, strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db4.2.spec?r1=1.73&r2=1.74&f=u