- rel 6; move includes to subdirectory to avoid include conflicts between this packag...

Changed files:
    ossp-uuid.spec -> 1.13

diff --git a/ossp-uuid.spec b/ossp-uuid.spec
index 5cc7483cb119d5243f396625a130cac6a60de022..98eeb4f633732d58a3e9cba3ad98788cf74a660f 100644 (file)
--- a/ossp-uuid.spec
+++ b/ossp-uuid.spec
@@ -9,7 +9,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/
@@ -109,6 +109,7 @@ PostgreSQL OSSP uuid module.
 %build
 # Build the library.
 %configure \
+       --includedir=%{_includedir}/oosp-uuid \
        --disable-static \
        --with-dce \
        --with-cxx \
@@ -155,7 +156,8 @@ rm -rf $RPM_BUILD_ROOT
 %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*
@@ -169,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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*
@@ -181,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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