From: <tr...@us...> - 2011-05-12 19:17:11
|
Revision: 3447 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=3447&view=rev Author: trisk Date: 2011-05-12 19:17:04 +0000 (Thu, 12 May 2011) Log Message: ----------- 2011-05-12 Albert Lee <tr...@op...> * SFEossp-uuid, base-specs/ossp-uuid.spec, patches/ossp-uuid-01-debian-0001.diff, patches/ossp-uuid-02-debian-0002.diff, patches/ossp-uuid-03-ldflags.diff: *NEW* API and CLI for Universally Unique Identifiers from OSSP Modified Paths: -------------- spec-files-extra/trunk/ChangeLog Added Paths: ----------- spec-files-extra/trunk/SFEossp-uuid.spec spec-files-extra/trunk/base-specs/ossp-uuid.spec spec-files-extra/trunk/patches/ossp-uuid-01-debian-0001.diff spec-files-extra/trunk/patches/ossp-uuid-02-debian-0002.diff spec-files-extra/trunk/patches/ossp-uuid-03-ldflags.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2011-05-11 18:02:13 UTC (rev 3446) +++ spec-files-extra/trunk/ChangeLog 2011-05-12 19:17:04 UTC (rev 3447) @@ -1,3 +1,11 @@ +2011-05-12 Albert Lee <tr...@op...> + + * SFEossp-uuid, base-specs/ossp-uuid.spec, + patches/ossp-uuid-01-debian-0001.diff, + patches/ossp-uuid-02-debian-0002.diff, + patches/ossp-uuid-03-ldflags.diff: *NEW* API and CLI for Universally + Unique Identifiers from OSSP + 2011-05-11 Alex Viskovatoff <he...@im...> * base-specs/ffmpeg.spec: bump to 0.6.3 Added: spec-files-extra/trunk/SFEossp-uuid.spec =================================================================== --- spec-files-extra/trunk/SFEossp-uuid.spec (rev 0) +++ spec-files-extra/trunk/SFEossp-uuid.spec 2011-05-12 19:17:04 UTC (rev 3447) @@ -0,0 +1,93 @@ +# +# spec file for package SFEossp-uuid +# +# includes module(s): ossp-uuid +# +%include Solaris.inc +%ifarch amd64 sparcv9 +%include arch64.inc +%use ossp_uuid_64 = ossp-uuid.spec +%endif + +%include base.inc +%use ossp_uuid = ossp-uuid.spec + +Name: SFEossp-uuid +IPS_package_name: library/ossp-uuid +Summary: %{ossp_uuid.summary} +Version: %{ossp_uuid.version} +SUNW_BaseDir: %{_basedir} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%include default-depend.inc + +%package devel +Summary: %{summary} - development files +SUNW_BaseDir: %{_basedir} +%include default-depend.inc +Requires: %name + +%prep +rm -rf %name-%version +mkdir %name-%version +%ifarch amd64 sparcv9 +mkdir %name-%version/%_arch64 +%ossp_uuid_64.prep -d %name-%version/%_arch64 +%endif + +mkdir %name-%version/%{base_arch} +%ossp_uuid.prep -d %name-%version/%{base_arch} + +%build +%ifarch amd64 sparcv9 +%ossp_uuid_64.build -d %name-%version/%_arch64 +%endif + +%ossp_uuid.build -d %name-%version/%{base_arch} + + +%install +rm -rf $RPM_BUILD_ROOT +%ifarch amd64 sparcv9 +%ossp_uuid_64.install -d %name-%version/%_arch64 +%endif + +%ossp_uuid.install -d %name-%version/%{base_arch} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_libdir} +%{_libdir}/lib*.so* +%dir %attr (0755, root, bin) %{_bindir} +%{_bindir}/uuid +%ifarch amd64 sparcv9 +%dir %attr (0755, root, bin) %{_libdir}/%{_arch64} +%{_libdir}/%{_arch64}/lib*.so* +%endif + +%files devel +%defattr (-, root, bin) +%dir %attr (0755, root, bin) %{_bindir} +%{_bindir}/uuid-config +%dir %attr (0755, root, bin) %{_includedir} +%{_includedir}/* +%dir %attr (0755, root, other) %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/* +%ifarch amd64 sparcv9 +%dir %attr (0755, root, bin) %{_libdir}/%{_arch64} +%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig +%{_libdir}/%{_arch64}/pkgconfig/* +%endif +%dir %attr (0755, root, sys) %_datadir +%dir %attr (0755, root, bin) %{_mandir} +%dir %attr (0755, root, bin) %{_mandir}/man1 +%{_mandir}/man1/* +%dir %attr (0755, root, bin) %{_mandir}/man3 +%{_mandir}/man3/* + +%changelog +* Thu May 12 2011 - Albert Lee <tr...@op...> +- Initial sepc Added: spec-files-extra/trunk/base-specs/ossp-uuid.spec =================================================================== --- spec-files-extra/trunk/base-specs/ossp-uuid.spec (rev 0) +++ spec-files-extra/trunk/base-specs/ossp-uuid.spec 2011-05-12 19:17:04 UTC (rev 3447) @@ -0,0 +1,49 @@ +# +# spec file for package ossp-uuid +# +# includes module(s): ossp-uuid +# + +Name: ossp-uuid +Summary: API and CLI for Universally Unique Identifiers from OSSP +Version: 1.6.2 +Source: http://ftp.netbsd.org/pub/NetBSD/packages/distfiles/uuid-%{version}.tar.gz +Patch1: ossp-uuid-01-debian-0001.diff +Patch2: ossp-uuid-02-debian-0002.diff +Patch3: ossp-uuid-03-ldflags.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%prep +%setup -q -n uuid-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '` +if test "x$CPUS" = "x" -o $CPUS = 0; then + CPUS=1 +fi +export CFLAGS="%optflags" +export LDFLAGS="%_ldflags" +if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q %{_arch64} ) ; then + export LDFLAGS="$LDFLAGS -m64" +fi + +./configure --prefix=%{_prefix} --mandir=%{_mandir} \ + --libdir=%{_libdir} \ + --enable-shared \ + --disable-static + +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Thu May 12 2011 - Albert Lee <tr...@op...> +- Initial base spec Added: spec-files-extra/trunk/patches/ossp-uuid-01-debian-0001.diff =================================================================== --- spec-files-extra/trunk/patches/ossp-uuid-01-debian-0001.diff (rev 0) +++ spec-files-extra/trunk/patches/ossp-uuid-01-debian-0001.diff 2011-05-12 19:17:04 UTC (rev 3447) @@ -0,0 +1,112 @@ +From: Piotr Roszatycki <de...@de...> +Date: Wed, 27 Jan 2010 16:53:11 +0100 +Subject: [PATCH] Change library name + +The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's +uuid library. +--- + Makefile.in | 6 +++--- + perl/Makefile.PL | 12 ++++++------ + php/config.m4 | 2 +- + uuid-config.in | 2 +- + uuid.pc.in | 4 ++-- + 5 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index d28f4be..c2ba99d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -62,13 +62,13 @@ PERL = @PERL@ + PHP = @PHP@ + PG_CONFIG = @PG_CONFIG@ + +-LIB_NAME = libuuid.la ++LIB_NAME = libossp-uuid.la + LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo + +-DCE_NAME = libuuid_dce.la ++DCE_NAME = libossp-uuid_dce.la + DCE_OBJS = uuid_dce.lo $(LIB_OBJS) + +-CXX_NAME = libuuid++.la ++CXX_NAME = libossp-uuid++.la + CXX_OBJS = uuid++.lo $(LIB_OBJS) + + PRG_NAME = uuid +diff --git a/perl/Makefile.PL b/perl/Makefile.PL +index 92f4494..9c6fee6 100644 +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL +@@ -33,9 +33,9 @@ use Config; + use ExtUtils::MakeMaker; + + # determine source directory +-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } +- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) +- or die "no source directory found (where libuuid.la is located)"; ++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } ++ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) ++ or die "no source directory found (where libossp-uuid.la is located)"; + + # determine extra build options + my $compat = 0; +@@ -47,15 +47,15 @@ WriteMakefile( + VERSION_FROM => 'uuid.pm', + ABSTRACT_FROM => 'uuid.pod', + PREREQ_PM => {}, +- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], ++ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], + DEFINE => '', + INC => "-I. -I$srcdir", + PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', + 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', + ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), + ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), }, +- MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3', +- ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), }, ++ MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm', ++ ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), }, + TYPEMAPS => [ 'uuid.tm' ], + test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') }, + NO_META => 1, +diff --git a/php/config.m4 b/php/config.m4 +index 5091b96..969b457 100644 +--- a/php/config.m4 ++++ b/php/config.m4 +@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then + PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) + AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) + PHP_ADD_LIBPATH([..], ) +- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) ++ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) + PHP_ADD_INCLUDE([..]) + PHP_SUBST(UUID_SHARED_LIBADD) + +diff --git a/uuid-config.in b/uuid-config.in +index 8d2a063..5b58812 100644 +--- a/uuid-config.in ++++ b/uuid-config.in +@@ -121,7 +121,7 @@ do + output_extra="$output_extra $uuid_ldflags" + ;; + --libs) +- output="$output -luuid" ++ output="$output -lossp-uuid" + output_extra="$output_extra $uuid_libs" + ;; + * ) +diff --git a/uuid.pc.in b/uuid.pc.in +index c76ad1e..de00c2f 100644 +--- a/uuid.pc.in ++++ b/uuid.pc.in +@@ -36,7 +36,7 @@ Name: OSSP uuid + Description: Universally Unique Identifier (UUID) Library + Version: @UUID_VERSION_RAW@ + URL: http://www.ossp.org/pkg/lib/uuid/ +-Cflags: -I${includedir} +-Libs: -L${libdir} -luuid ++Cflags: -I${includedir}/ossp ++Libs: -L${libdir} -lossp-uuid + Libs.private: @LIBS@ + +-- Added: spec-files-extra/trunk/patches/ossp-uuid-02-debian-0002.diff =================================================================== --- spec-files-extra/trunk/patches/ossp-uuid-02-debian-0002.diff (rev 0) +++ spec-files-extra/trunk/patches/ossp-uuid-02-debian-0002.diff 2011-05-12 19:17:04 UTC (rev 3447) @@ -0,0 +1,55 @@ +From: Marco Nenciarini <mar...@de...> +Date: Wed, 27 Jan 2010 19:46:21 +0100 +Subject: [PATCH] uuid: preserve -m option status in -v option handling + +Bug: 531396 +--- + uuid_cli.c | 19 ++++++++++--------- + 1 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/uuid_cli.c b/uuid_cli.c +index d1b0b11..14a67fe 100644 +--- a/uuid_cli.c ++++ b/uuid_cli.c +@@ -140,11 +140,12 @@ int main(int argc, char *argv[]) + i = strtol(optarg, &p, 10); + if (*p != '\0') + usage("invalid argument to option 'v'"); ++ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); + switch (i) { +- case 1: version = UUID_MAKE_V1; break; +- case 3: version = UUID_MAKE_V3; break; +- case 4: version = UUID_MAKE_V4; break; +- case 5: version = UUID_MAKE_V5; break; ++ case 1: version |= UUID_MAKE_V1; break; ++ case 3: version |= UUID_MAKE_V3; break; ++ case 4: version |= UUID_MAKE_V4; break; ++ case 5: version |= UUID_MAKE_V5; break; + default: + usage("invalid version on option 'v'"); + break; +@@ -213,10 +214,10 @@ int main(int argc, char *argv[]) + } + else { + /* encoding */ +- if ( (version == UUID_MAKE_V1 && argc != 0) +- || (version == UUID_MAKE_V3 && argc != 2) +- || (version == UUID_MAKE_V4 && argc != 0) +- || (version == UUID_MAKE_V5 && argc != 2)) ++ if ( (version & UUID_MAKE_V1 && argc != 0) ++ || (version & UUID_MAKE_V3 && argc != 2) ++ || (version & UUID_MAKE_V4 && argc != 0) ++ || (version & UUID_MAKE_V5 && argc != 2)) + usage("invalid number of arguments"); + if ((rc = uuid_create(&uuid)) != UUID_RC_OK) + error(1, "uuid_create: %s", uuid_error(rc)); +@@ -232,7 +233,7 @@ int main(int argc, char *argv[]) + if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) + error(1, "uuid_load: %s", uuid_error(rc)); + } +- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { ++ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { + if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) + error(1, "uuid_create: %s", uuid_error(rc)); + if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { +-- Added: spec-files-extra/trunk/patches/ossp-uuid-03-ldflags.diff =================================================================== --- spec-files-extra/trunk/patches/ossp-uuid-03-ldflags.diff (rev 0) +++ spec-files-extra/trunk/patches/ossp-uuid-03-ldflags.diff 2011-05-12 19:17:04 UTC (rev 3447) @@ -0,0 +1,28 @@ +--- uuid-1.6.2.orig/Makefile.in 2011-05-12 14:40:21.836393392 -0400 ++++ uuid-1.6.2/Makefile.in 2011-05-12 14:44:18.385247721 -0400 +@@ -112,16 +112,19 @@ + @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< + + $(LIB_NAME): $(LIB_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ +- -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) \ ++ $(LIBS) -rpath $(libdir) -version-info \ ++ `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(DCE_NAME): $(DCE_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ +- -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) \ ++ $(LIBS) -rpath $(libdir) -version-info \ ++ `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(CXX_NAME): $(CXX_OBJS) +- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ +- -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` ++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) \ ++ $(LIBS) -rpath $(libdir) -version-info \ ++ `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(PRG_NAME) $(PRG_OBJS) $(LIB_NAME) $(LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |