SPECS: ossp-uuid.spec - rel 6; move includes to subdirectory to avoid inclu...

[arekm]

Author: arekm                        Date: Mon Feb 23 11:39:07 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 6; move includes to subdirectory to avoid include conflicts between this package and libuuid-devel

---- Files affected:
SPECS:
   ossp-uuid.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/ossp-uuid.spec
diff -u SPECS/ossp-uuid.spec:1.12 SPECS/ossp-uuid.spec:1.13
--- SPECS/ossp-uuid.spec:1.12	Wed Nov  5 13:43:30 2008
+++ SPECS/ossp-uuid.spec	Mon Feb 23 12:39:02 2009
@@ -10,7 +10,7 @@
 Summary:	Universally Unique Identifier library
 Name:		ossp-uuid
 Version:	1.6.2
-Release:	5
+Release:	6
 License:	MIT
 Group:		Libraries
 URL:		http://www.ossp.org/pkg/lib/uuid/
@@ -110,6 +110,7 @@
 %build
 # Build the library.
 %configure \
+	--includedir=%{_includedir}/oosp-uuid \
 	--disable-static \
 	--with-dce \
 	--with-cxx \
@@ -156,7 +157,8 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uuid-config
-%{_includedir}/uuid.h
+%dir %{_includedir}/oosp-uuid
+%{_includedir}/oosp-uuid/uuid.h
 %{_libdir}/libossp-uuid.so
 %{_pkgconfigdir}/ossp-uuid.pc
 %{_mandir}/man3/ossp-uuid.3*
@@ -170,7 +172,7 @@
 
 %files c++-devel
 %defattr(644,root,root,755)
-%{_includedir}/uuid++.hh
+%{_includedir}/oosp-uuid/uuid++.hh
 %{_libdir}/libossp-uuid++.so
 %{_libdir}/libossp-uuid++.la
 %{_mandir}/man3/uuid++.3*
@@ -182,7 +184,7 @@
 
 %files dce-devel
 %defattr(644,root,root,755)
-%{_includedir}/uuid_dce.h
+%{_includedir}/oosp-uuid/uuid_dce.h
 %{_libdir}/libossp-uuid_dce.so
 %{_libdir}/libossp-uuid_dce.la
 
@@ -216,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/02/23 11:39:02  arekm
+- rel 6; move includes to subdirectory to avoid include conflicts between this package and libuuid-devel
+
 Revision 1.12  2008/11/05 12:43:30  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ossp-uuid.spec?r1=1.12&r2=1.13&f=u