OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Sep-2009 17:02:00
Branch: HEAD Handle: 2009093016020000
Modified files:
openpkg-src/libuuid libuuid.spec
Log:
resolve namespace collision with OSSP uuid
Summary:
Revision Changes Path
1.28 +5 -5 openpkg-src/libuuid/libuuid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libuuid/libuuid.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 libuuid.spec
--- openpkg-src/libuuid/libuuid.spec 18 Sep 2009 08:30:08 -0000 1.27
+++ openpkg-src/libuuid/libuuid.spec 30 Sep 2009 15:02:00 -0000 1.28
@@ -36,7 +36,7 @@
Group: Libraries
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20090918
+Release: 20090930
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-%{V_major}.%{V_minor}.tar.gz
@@ -86,8 +86,8 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/include \
- $RPM_BUILD_ROOT%{l_prefix}/lib \
+ $RPM_BUILD_ROOT%{l_prefix}/include/e2fs/uuid \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/e2fs \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man3
%{l_shtool} install -c -s -m 755 \
@@ -98,9 +98,9 @@
-e 's;E2fsprogs version @E2FSPROGS_VERSION@;;' \
misc/uuidgen.1.in $RPM_BUILD_ROOT%{l_prefix}/man/man1/uuidgen.1
%{l_shtool} install -c -m 644 \
- lib/uuid/uuid.h $RPM_BUILD_ROOT%{l_prefix}/include/
+ lib/uuid/uuid.h $RPM_BUILD_ROOT%{l_prefix}/include/e2fs/uuid/
%{l_shtool} install -c -m 644 \
- lib/uuid/libuuid.a $RPM_BUILD_ROOT%{l_prefix}/lib/
+ lib/uuid/libuuid.a $RPM_BUILD_ROOT%{l_prefix}/lib/e2fs/
for man in lib/uuid/*.3.in; do
basename=`echo $man | sed -e 's;^.*/\([^/]*\)\.in$;\1;'`
%{l_shtool} install -c -m 644 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
