From 5d2be8a1115327b818bc4d85c4cdb70a4d78fdaa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 4 Dec 2007 18:36:52 +0000 Subject: [PATCH 1/5] Initialize branch EL-4 for xbae --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 6d0fb5b13523d499579721781447620ace705dbd Mon Sep 17 00:00:00 2001 From: pertusus Date: Tue, 11 Dec 2007 08:57:17 +0000 Subject: [PATCH 2/5] sync with devel --- xbae.spec | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/xbae.spec b/xbae.spec index a2053c2..2b52ce1 100644 --- a/xbae.spec +++ b/xbae.spec @@ -121,36 +121,36 @@ install -p -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la # prepare the main docs -# Use systematically __fedora_* to avoid directory name clash. -rm -rf __fedora_Xbae-docs -mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __fedora_Xbae-docs +# Use systematically __dist_* to avoid directory name clash. +rm -rf __dist_Xbae-docs +mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __dist_Xbae-docs # remove duplicate files already in %%doc -rm __fedora_Xbae-docs/README -rm __fedora_Xbae-docs/NEWS +rm __dist_Xbae-docs/README +rm __dist_Xbae-docs/NEWS # examples for builderXcessory are arch specific, this avoids clash of # doc files between arches -mv __fedora_Xbae-docs/examples/builderXcessory __fedora_Xbae-docs/examples/builderXcessory-%{_arch} +mv __dist_Xbae-docs/examples/builderXcessory __dist_Xbae-docs/examples/builderXcessory-%{_arch} # first clean examples -rm -rf __fedora_examples -cp -pr examples __fedora_examples -make -C __fedora_examples clean -find __fedora_examples -name '*akefile*' -exec rm {} \; -rm __fedora_examples/extest -rm __fedora_examples/testall +rm -rf __dist_examples +cp -pr examples __dist_examples +make -C __dist_examples clean +find __dist_examples -name '*akefile*' -exec rm {} \; +rm __dist_examples/extest +rm __dist_examples/testall # the builderXcessory directory is duplicated in the main doc and in the # example code. The master dir is considered to be in the main doc. # the README is better with the main examples doc, not in code examples -mv __fedora_examples/builderXcessory/README __fedora_Xbae-docs/examples/builderXcessory-%{_arch}/ +mv __dist_examples/builderXcessory/README __dist_Xbae-docs/examples/builderXcessory-%{_arch}/ # remove the duplicate dir and replace it with a link -rm -rf __fedora_examples/builderXcessory/ -ln -s ../examples/builderXcessory-%{_arch}/ __fedora_examples/builderXcessory-%{_arch} +rm -rf __dist_examples/builderXcessory/ +ln -s ../examples/builderXcessory-%{_arch}/ __dist_examples/builderXcessory-%{_arch} # then put the examples in a code_examples directory -rm -rf __fedora_code_examples -mkdir __fedora_code_examples -mv __fedora_examples __fedora_code_examples/code_examples +rm -rf __dist_code_examples +mkdir __dist_code_examples +mv __dist_examples __dist_code_examples/code_examples %clean @@ -169,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc __fedora_Xbae-docs/* __fedora_code_examples/code_examples +%doc __dist_Xbae-docs/* __dist_code_examples/code_examples %{_includedir}/Xbae/ %{_libdir}/libXbae.so %{_mandir}/man*/Xbae* From 418c7f00ba20b4d045f78891805655c1701ec5f7 Mon Sep 17 00:00:00 2001 From: pertusus Date: Tue, 11 Dec 2007 08:58:56 +0000 Subject: [PATCH 3/5] bump release --- xbae.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbae.spec b/xbae.spec index 2b52ce1..0f22f56 100644 --- a/xbae.spec +++ b/xbae.spec @@ -10,7 +10,7 @@ Name: xbae Version: 4.60.4 -Release: 8%{?dist} +Release: 8%{?dist}.1 Summary: Motif matrix, caption and text input widgets Group: System Environment/Libraries # all the files are covered by the MIT license, except DebugUtil.c LGPLv2+ @@ -177,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Aug 22 2007 Patrice Dumas 4.60.4-8 +* Wed Aug 22 2007 Patrice Dumas 4.60.4-8.1 - fix license and source url * Wed Jul 25 2007 Patrice Dumas 4.60.4-7 From 9c55f3995e181314ce236b84de444066563167a3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:13 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b0ffd2..eb9e253 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xbae -# $Id$ +# $Id: Makefile,v 1.1 2006/09/09 15:18:13 pertusus Exp $ NAME := xbae 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 dae5d232bbb864ad24e40d87745d5ee5595e469a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:32:55 +0000 Subject: [PATCH 5/5] 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 eb9e253..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xbae -# $Id: Makefile,v 1.1 2006/09/09 15:18:13 pertusus Exp $ -NAME := xbae -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 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4