SPECS: uuid.spec - add ossp prefix to libs (patch from fedora)

glen glen at pld-linux.org
Tue Jun 10 22:15:54 CEST 2008


Author: glen                         Date: Tue Jun 10 20:15:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add ossp prefix to libs (patch from fedora)

---- Files affected:
SPECS:
   uuid.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/uuid.spec
diff -u SPECS/uuid.spec:1.4 SPECS/uuid.spec:1.5
--- SPECS/uuid.spec:1.4	Tue Jun 10 22:02:58 2008
+++ SPECS/uuid.spec	Tue Jun 10 22:15:49 2008
@@ -1,9 +1,8 @@
 # $Revision$, $Date$
 # TODO
-# - conflicts with e2fsprogs uuid, rename libs with ossp prefix?
 # - rename include ossp/uuid.h?
 # - rename package to ossp-uuid?
-# - fix bindings compilation
+# - fix bindings compilation (when library is not installed)
 #
 # Conditional build:
 %bcond_without	php		# build PHP binding
@@ -13,12 +12,13 @@
 Summary:	Universally Unique Identifier library
 Name:		uuid
 Version:	1.6.1
-Release:	0.2
+Release:	0.5
 License:	MIT
 Group:		Libraries
 URL:		http://www.ossp.org/pkg/lib/uuid/
 Source0:	ftp://ftp.ossp.org/pkg/lib/uuid/%{name}-%{version}.tar.gz
 # Source0-md5:	18c8875411da07fe4503fdfc2136bf46
+Patch0:		%{name}-ossp-prefix.patch
 BuildRequires:	libtool
 %{?with_php:BuildRequires:	php-devel >= 3:5.0.0}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
@@ -107,6 +107,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Build the library.
@@ -146,42 +147,42 @@
 %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}/libuuid.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuuid.so.16
+%attr(755,root,root) %{_libdir}/libossp-uuid.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/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
-%{_libdir}/libuuid.so
-%{_pkgconfigdir}/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_pkgconfigdir}/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 %{_mandir}/man1/uuid-config.1*
-%{_libdir}/libuuid.la
+%{_libdir}/libossp-uuid.la
 
 %files c++
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libuuid++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuuid++.so.16
+%attr(755,root,root) %{_libdir}/libossp-uuid++.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libossp-uuid++.so.16
 
 %files c++-devel
 %defattr(644,root,root,755)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
-%{_libdir}/libuuid++.la
+%{_libdir}/libossp-uuid++.so
+%{_libdir}/libossp-uuid++.la
 %{_mandir}/man3/uuid++.3*
 
 %files dce
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libuuid_dce.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuuid_dce.so.16
+%attr(755,root,root) %{_libdir}/libossp-uuid_dce.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libossp-uuid_dce.so.16
 
 %files dce-devel
 %defattr(644,root,root,755)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
-%{_libdir}/libuuid_dce.la
+%{_libdir}/libossp-uuid_dce.so
+%{_libdir}/libossp-uuid_dce.la
 
 %if %{with perl}
 %files -n perl-%{name}
@@ -196,14 +197,14 @@
 %if %{with php}
 %files -n php-%{name}
 %defattr(644,root,root,755)
-%{_libdir}/php/uuid.so
+%{_libdir}/php/ossp-uuid.so
 %{_datadir}/php/uuid.php
 %endif
 
 %if %{with pgsql}
 %files -n postgresql-%{name}
 %defattr(644,root,root,755)
-%{_libdir}/postgresql/uuid.so
+%{_libdir}/postgresql/ossp-uuid.so
 %{_datadir}/postgresql/uuid.sql
 %endif
 
@@ -213,6 +214,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008-06-10 20:15:49  glen
+- add ossp prefix to libs (patch from fedora)
+
 Revision 1.4  2008-06-10 20:02:58  glen
 - update to 1.6.1
 - update descs to understand that those are bindings for language not uuid addons to use language
================================================================

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



More information about the pld-cvs-commit mailing list