- fix typo oosp-uuid to ossp-uuid

[packages/ossp-uuid.git] / ossp-uuid.spec

diff --git a/ossp-uuid.spec b/ossp-uuid.spec
index 9968d8d960cc73a56ae82996e1cfac918ac10044..dc7be20d4e9c95ba6c430af486f29fa989cd6d79 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:       3
+Release:       7
 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}/ossp-uuid \
        --disable-static \
        --with-dce \
        --with-cxx \
@@ -120,6 +121,7 @@ PostgreSQL OSSP uuid module.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_lib}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -128,6 +130,9 @@ install -d $RPM_BUILD_ROOT%{_datadir}/php
 mv $RPM_BUILD_ROOT{%{php_extensiondir},%{_datadir}/php}/uuid.php
 %endif
 
+mv -f $RPM_BUILD_ROOT%{_libdir}/libossp-uuid.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libossp-uuid.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libossp-uuid.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -144,14 +149,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %attr(755,root,root) %{_bindir}/uuid
-%attr(755,root,root) %{_libdir}/libossp-uuid.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libossp-uuid.so.16
+%attr(755,root,root) /%{_lib}/libossp-uuid.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libossp-uuid.so.16
 %{_mandir}/man1/uuid.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uuid-config
-%{_includedir}/uuid.h
+%dir %{_includedir}/ossp-uuid
+%{_includedir}/ossp-uuid/uuid.h
 %{_libdir}/libossp-uuid.so
 %{_pkgconfigdir}/ossp-uuid.pc
 %{_mandir}/man3/ossp-uuid.3*
@@ -165,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files c++-devel
 %defattr(644,root,root,755)
-%{_includedir}/uuid++.hh
+%{_includedir}/ossp-uuid/uuid++.hh
 %{_libdir}/libossp-uuid++.so
 %{_libdir}/libossp-uuid++.la
 %{_mandir}/man3/uuid++.3*
@@ -177,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dce-devel
 %defattr(644,root,root,755)
-%{_includedir}/uuid_dce.h
+%{_includedir}/ossp-uuid/uuid_dce.h
 %{_libdir}/libossp-uuid_dce.so
 %{_libdir}/libossp-uuid_dce.la