rpms/uuid/devel .cvsignore, 1.3, 1.4 ossp-uuid.patch, 1.1, 1.2 sources, 1.3, 1.4 uuid.spec, 1.2, 1.3
Steven Pritchard (steve)
fedora-extras-commits at redhat.com
Thu Sep 21 21:18:06 UTC 2006
Author: steve
Update of /cvs/extras/rpms/uuid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30562
Modified Files:
.cvsignore ossp-uuid.patch sources uuid.spec
Log Message:
Update to 1.5.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1 Aug 2006 22:26:35 -0000 1.3
+++ .cvsignore 21 Sep 2006 21:18:06 -0000 1.4
@@ -1 +1 @@
-uuid-1.5.0.tar.gz
+uuid-1.5.1.tar.gz
ossp-uuid.patch:
Index: ossp-uuid.patch
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/ossp-uuid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ossp-uuid.patch 1 Aug 2006 22:26:35 -0000 1.1
+++ ossp-uuid.patch 21 Sep 2006 21:18:06 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urN uuid-1.5.0.orig/Makefile.PL uuid-1.5.0/Makefile.PL
---- uuid-1.5.0.orig/Makefile.PL 2006-01-15 12:37:43.000000000 -0600
-+++ uuid-1.5.0/Makefile.PL 2006-07-29 14:49:23.000000000 -0500
+diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
+--- uuid-1.5.1.orig/Makefile.PL 2006-01-15 12:37:43.000000000 -0600
++++ uuid-1.5.1/Makefile.PL 2006-09-21 15:59:40.000000000 -0500
@@ -44,7 +44,7 @@
all pure_all:
\@if [ ! -d build ]; then mkdir build; fi
@@ -10,9 +10,9 @@
\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
-diff -urN uuid-1.5.0.orig/Makefile.in uuid-1.5.0/Makefile.in
---- uuid-1.5.0.orig/Makefile.in 2006-05-11 04:37:27.000000000 -0500
-+++ uuid-1.5.0/Makefile.in 2006-07-29 15:37:47.000000000 -0500
+diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
+--- uuid-1.5.1.orig/Makefile.in 2006-07-31 07:20:03.000000000 -0500
++++ uuid-1.5.1/Makefile.in 2006-09-21 16:06:31.000000000 -0500
@@ -61,13 +61,13 @@
PHP = @PHP@
PG_CONFIG = @PG_CONFIG@
@@ -52,7 +52,7 @@
$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
- at if [ ".$(WITH_DCE)" = .yes ]; then \
echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
-@@ -240,17 +240,17 @@
+@@ -240,7 +240,7 @@
echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
fi
@@ -61,32 +61,9 @@
- at if [ ".$(WITH_CXX)" = .yes ]; then \
echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
- fi
-- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid.la $(DESTDIR)$(libdir)/
-+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid.la $(DESTDIR)$(libdir)/
- - at if [ ".$(WITH_DCE)" = .yes ]; then \
-- $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid_dce.la $(DESTDIR)$(libdir)/; \
-+ $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid_dce.la $(DESTDIR)$(libdir)/; \
- fi
- - at if [ ".$(WITH_CXX)" = .yes ]; then \
-- $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid++.la $(DESTDIR)$(libdir)/; \
-+ $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid++.la $(DESTDIR)$(libdir)/; \
- fi
- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
- $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
-@@ -268,14 +268,14 @@
- uninstall:
- -$(RM) $(DESTDIR)$(mandir)/man1/uuid.1
- -@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(bindir)/uuid
-- -@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid.la
-+ -@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid.la
- - at if [ ".$(WITH_DCE)" = .yes ]; then \
-- $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid_dce.la; \
-+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid_dce.la; \
- fi
+@@ -275,7 +275,7 @@
- at if [ ".$(WITH_CXX)" = .yes ]; then \
-- $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid++.la; \
-+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid++.la; \
+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
fi
- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
+ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
@@ -102,9 +79,9 @@
-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
-$(RM) $(DESTDIR)$(bindir)/uuid-config
-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
-diff -urN uuid-1.5.0.orig/perl/Makefile.PL uuid-1.5.0/perl/Makefile.PL
---- uuid-1.5.0.orig/perl/Makefile.PL 2006-01-13 00:44:33.000000000 -0600
-+++ uuid-1.5.0/perl/Makefile.PL 2006-07-29 14:51:01.000000000 -0500
+diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
+--- uuid-1.5.1.orig/perl/Makefile.PL 2006-01-13 00:44:33.000000000 -0600
++++ uuid-1.5.1/perl/Makefile.PL 2006-09-21 15:59:40.000000000 -0500
@@ -33,9 +33,9 @@
use ExtUtils::MakeMaker;
@@ -127,9 +104,9 @@
DEFINE => '',
INC => "-I. -I$srcdir",
PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
-diff -urN uuid-1.5.0.orig/pgsql/Makefile uuid-1.5.0/pgsql/Makefile
---- uuid-1.5.0.orig/pgsql/Makefile 2006-01-12 14:31:51.000000000 -0600
-+++ uuid-1.5.0/pgsql/Makefile 2006-07-29 19:07:46.000000000 -0500
+diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
+--- uuid-1.5.1.orig/pgsql/Makefile 2006-07-31 07:36:58.000000000 -0500
++++ uuid-1.5.1/pgsql/Makefile 2006-09-21 16:07:23.000000000 -0500
@@ -17,13 +17,13 @@
top_builddir := $(dir $(PGXS))../..
include $(top_builddir)/src/Makefile.global
@@ -150,8 +127,8 @@
include $(top_builddir)/src/Makefile.shlib
uuid.sql: uuid.sql.in
-- sed -e 's;@MODULE_PATHNAME@;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
-+ sed -e 's;@MODULE_PATHNAME@;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
+- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
++ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
install: all
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
@@ -166,9 +143,9 @@
-rm -f $(DESTDIR)$(datadir)/uuid.sql
clean distclean: clean-lib
-diff -urN uuid-1.5.0.orig/php/Makefile.local uuid-1.5.0/php/Makefile.local
---- uuid-1.5.0.orig/php/Makefile.local 2006-04-04 09:58:43.000000000 -0500
-+++ uuid-1.5.0/php/Makefile.local 2006-07-29 15:38:23.000000000 -0500
+diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
+--- uuid-1.5.1.orig/php/Makefile.local 2006-07-31 06:41:46.000000000 -0500
++++ uuid-1.5.1/php/Makefile.local 2006-09-21 15:59:40.000000000 -0500
@@ -48,7 +48,7 @@
@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
echo "installing PHP$$version API into $$extdir"; \
@@ -178,9 +155,9 @@
./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
clean:
-diff -urN uuid-1.5.0.orig/php/config.m4 uuid-1.5.0/php/config.m4
---- uuid-1.5.0.orig/php/config.m4 2006-01-13 00:44:34.000000000 -0600
-+++ uuid-1.5.0/php/config.m4 2006-07-29 16:14:57.000000000 -0500
+diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
+--- uuid-1.5.1.orig/php/config.m4 2006-01-13 00:44:34.000000000 -0600
++++ uuid-1.5.1/php/config.m4 2006-09-21 15:59:40.000000000 -0500
@@ -34,7 +34,7 @@
PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
@@ -190,9 +167,9 @@
PHP_ADD_INCLUDE([..])
PHP_SUBST(UUID_SHARED_LIBADD)
dnl avoid conflict with libc's uuid_create(3)
-diff -urN uuid-1.5.0.orig/php/uuid.ts uuid-1.5.0/php/uuid.ts
---- uuid-1.5.0.orig/php/uuid.ts 2006-01-13 00:44:34.000000000 -0600
-+++ uuid-1.5.0/php/uuid.ts 2006-07-29 15:41:45.000000000 -0500
+diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
+--- uuid-1.5.1.orig/php/uuid.ts 2006-01-13 00:44:34.000000000 -0600
++++ uuid-1.5.1/php/uuid.ts 2006-09-21 15:59:40.000000000 -0500
@@ -34,9 +34,9 @@
$php_version = $argv[1];
@@ -205,9 +182,9 @@
}
print "++ loading PHP uuid.php${php_version} (high-level API)\n";
-diff -urN uuid-1.5.0.orig/uuid-config.in uuid-1.5.0/uuid-config.in
---- uuid-1.5.0.orig/uuid-config.in 2006-01-13 00:44:30.000000000 -0600
-+++ uuid-1.5.0/uuid-config.in 2006-07-29 15:27:38.000000000 -0500
+diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
+--- uuid-1.5.1.orig/uuid-config.in 2006-01-13 00:44:30.000000000 -0600
++++ uuid-1.5.1/uuid-config.in 2006-09-21 15:59:40.000000000 -0500
@@ -120,7 +120,7 @@
output_extra="$output_extra $uuid_ldflags"
;;
@@ -217,9 +194,9 @@
output_extra="$output_extra $uuid_libs"
;;
* )
-diff -urN uuid-1.5.0.orig/uuid.pc.in uuid-1.5.0/uuid.pc.in
---- uuid-1.5.0.orig/uuid.pc.in 2006-01-13 00:44:30.000000000 -0600
-+++ uuid-1.5.0/uuid.pc.in 2006-07-29 15:27:48.000000000 -0500
+diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
+--- uuid-1.5.1.orig/uuid.pc.in 2006-01-13 00:44:30.000000000 -0600
++++ uuid-1.5.1/uuid.pc.in 2006-09-21 15:59:40.000000000 -0500
@@ -37,6 +37,6 @@
Version: @UUID_VERSION_RAW@
URL: http://www.ossp.org/pkg/lib/uuid/
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 1 Aug 2006 22:26:35 -0000 1.3
+++ sources 21 Sep 2006 21:18:06 -0000 1.4
@@ -1 +1 @@
-b0a428352fe9fb5fdd241406af04c08b uuid-1.5.0.tar.gz
+d7df0c4cb02dad7ce3e1ec8fc669f724 uuid-1.5.1.tar.gz
Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/uuid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uuid.spec 1 Aug 2006 22:26:35 -0000 1.2
+++ uuid.spec 21 Sep 2006 21:18:06 -0000 1.3
@@ -1,5 +1,5 @@
Name: uuid
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: Universally Unique Identifier library
License: MIT
@@ -98,12 +98,13 @@
%setup -q
%patch0 -p1
-pushd pgsql
-make realclean
-popd
-
%build
# Build the library.
+export LIB_NAME=libossp-uuid.la
+export DCE_NAME=libossp-uuid_dce.la
+export CXX_NAME=libossp-uuid++.la
+export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so
+export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so
%configure \
--disable-static \
--without-perl \
@@ -232,6 +233,9 @@
%{_libdir}/libossp-uuid_dce.so
%changelog
+* Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> 1.5.1-1
+- Update to 1.5.1.
+
* Sat Jul 29 2006 Steven Pritchard <steve at kspei.com> 1.5.0-1
- Update to 1.5.0.
- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
More information about the scm-commits
mailing list