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: 18-Sep-2009 10:30:08
Branch: HEAD Handle: 2009091809300800
Modified files:
openpkg-src/libuuid libuuid.patch libuuid.spec
Log:
upgrading package: libuuid 1.41.4 -> 1.41.9
Summary:
Revision Changes Path
1.4 +29 -19 openpkg-src/libuuid/libuuid.patch
1.27 +11 -9 openpkg-src/libuuid/libuuid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libuuid/libuuid.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 libuuid.patch
--- openpkg-src/libuuid/libuuid.patch 30 May 2006 13:05:27 -0000 1.3
+++ openpkg-src/libuuid/libuuid.patch 18 Sep 2009 08:30:08 -0000 1.4
@@ -1,7 +1,7 @@
Index: lib/uuid/Makefile.in
---- lib/uuid/Makefile.in.orig 2005-12-30 04:19:32 +0100
-+++ lib/uuid/Makefile.in 2006-05-30 15:03:48 +0200
-@@ -1,14 +1,18 @@
+--- lib/uuid/Makefile.in.orig 2009-08-13 03:39:57 +0200
++++ lib/uuid/Makefile.in 2009-09-18 09:27:03 +0200
+@@ -1,14 +1,20 @@
# Makefile for the UUID library
#
@@ -20,10 +20,12 @@
-INSTALL = @INSTALL@
-
-...@mconfig@
+...@echo
++Q=
all::
-@@ -53,24 +57,15 @@
+@@ -53,21 +59,15 @@
BSDLIB_MYDIR = uuid
BSDLIB_INSTALL_DIR = $(root_libdir)
@@ -34,26 +36,23 @@
-...@makefile_checker@
-
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
-...@profile_cmt@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-...@checker_cmt@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-...@elf_cmt@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-...@bsdlib_cmt@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c
$<
--
--all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+...@profile_cmt@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+...@checker_cmt@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c
$<
+...@elf_cmt@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+...@bsdlib_cmt@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o
-c $<
--$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in
$(top_builddir)/config.status
-- cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+-all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
+libuuid.a: $(OBJS)
+ ar cr libuuid.a $(OBJS)
+ ranlib libuuid.a
+
+all:: tst_uuid uuid_time $(SMANPAGES)
- tst_uuid.o: $(srcdir)/tst_uuid.c
- @echo " CC $@"
-@@ -172,15 +167,6 @@
+ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in
$(top_builddir)/config.status
+ cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+@@ -172,15 +172,6 @@
$(RM) -f .depend Makefile uuid.pc \
$(srcdir)/TAGS $(srcdir)/Makefile.in.old
@@ -70,8 +69,8 @@
#
# Makefile dependencies follow. This must be the last section in
Index: lib/uuid/configure.in
---- lib/uuid/configure.in.orig 2005-09-06 11:40:14 +0200
-+++ lib/uuid/configure.in 2006-05-30 15:02:49 +0200
+--- lib/uuid/configure.in.orig 2009-08-13 03:39:57 +0200
++++ lib/uuid/configure.in 2009-09-18 09:26:44 +0200
@@ -7,4 +7,31 @@
AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
@@ -105,3 +104,14 @@
+
+AC_OUTPUT(Makefile uuid_types.h)
+
+Index: lib/uuid/gen_uuid.c
+--- lib/uuid/gen_uuid.c.orig 2009-08-13 03:39:57 +0200
++++ lib/uuid/gen_uuid.c 2009-09-18 09:28:51 +0200
+@@ -53,6 +53,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libuuid/libuuid.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 libuuid.spec
--- openpkg-src/libuuid/libuuid.spec 30 Jun 2009 20:20:54 -0000 1.26
+++ openpkg-src/libuuid/libuuid.spec 18 Sep 2009 08:30:08 -0000 1.27
@@ -23,7 +23,7 @@
# package version
%define V_major 1.41
-%define V_minor 4
+%define V_minor 9
# package information
Name: libuuid
@@ -36,7 +36,7 @@
Group: Libraries
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20090327
+Release: 20090918
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-%{V_major}.%{V_minor}.tar.gz
@@ -57,7 +57,7 @@
%track
prog libuuid = {
- version = %{V_major}-WIP-%{V_minor}
+ version = %{V_major}.%{V_minor}
url = http://sourceforge.net/projects/e2fsprogs/files/
regex = e2fsprogs-(\d+(\.\d+)+)\.tar\.gz
}
@@ -76,7 +76,6 @@
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags} libuuid.a
- %{l_make} %{l_mflags} all
) || exit $?
( cd misc
%{l_cc} %{l_cflags -O} -I../lib \
@@ -102,11 +101,14 @@
lib/uuid/uuid.h $RPM_BUILD_ROOT%{l_prefix}/include/
%{l_shtool} install -c -m 644 \
lib/uuid/libuuid.a $RPM_BUILD_ROOT%{l_prefix}/lib/
- %{l_shtool} install -c -m 644 \
- -e 's;@E2FSPROGS_YEAR@;;' \
- -e 's;@E2FSPROGS_MONTH@;;' \
- -e 's;E2fsprogs version @E2FSPROGS_VERSION@;;' \
- lib/uuid/*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
+ for man in lib/uuid/*.3.in; do
+ basename=`echo $man | sed -e 's;^.*/\([^/]*\)\.in$;\1;'`
+ %{l_shtool} install -c -m 644 \
+ -e 's;@E2FSPROGS_YEAR@;;' \
+ -e 's;@E2FSPROGS_MONTH@;;' \
+ -e 's;E2fsprogs version @E2FSPROGS_VERSION@;;' \
+ $man $RPM_BUILD_ROOT%{l_prefix}/man/man3/$basename
+ done
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
