From 3a12c61f84ce1565fb22dd5dae9dfd1e4ecfc8bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 12 Mar 2007 02:53:12 +0000 Subject: [PATCH 1/4] Initialize branch EL-5 for uuid --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 348319630a75a47490ad166ba018624abc6550d2 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 18 Apr 2007 18:26:58 +0000 Subject: [PATCH 2/4] Fix find option order. Use fixperms macro instead of our own chmod incantation. BR ExtUtils::MakeMaker. --- uuid.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/uuid.spec b/uuid.spec index 951d5db..b4d7fb1 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,6 +1,6 @@ Name: uuid Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -50,6 +50,7 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries +BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} @@ -144,9 +145,9 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* popd # Install the PHP module. @@ -233,6 +234,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Tue Apr 17 2007 Steven Pritchard 1.5.1-3 +- Fix find option order. +- Use fixperms macro instead of our own chmod incantation. +- BR ExtUtils::MakeMaker. + * Thu Oct 05 2006 Christian Iseli 1.5.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From 1e81d645e333c7d5309177fc6958a62933e89120 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:54 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 649f88d..53a50dc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := uuid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e993ac0e23babfb4615cd001b518a16abe3deb58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:51:43 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 53a50dc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: uuid -# $Id$ -NAME := uuid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5