From d041f058f3363347d9523926161a2dcc1445a26c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:35:31 +0000 Subject: [PATCH 1/8] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e5a2966..c79500c 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := alchemist SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +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 +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt 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) From 44e9c76dab78bff576dfa6395fbcb69d380cc44c Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 12 Feb 2008 18:26:13 +0000 Subject: [PATCH 2/8] - Removed HTML documentation to avoid multilib conflict (bug #340601). Don't use alchemist in new software. --- alchemist.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alchemist.spec b/alchemist.spec index ba5da59..c420e2f 100644 --- a/alchemist.spec +++ b/alchemist.spec @@ -3,7 +3,7 @@ Summary: A multi-sourced configuration back-end. Name: alchemist Version: 1.0.37 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz @@ -76,9 +76,12 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ %{_mandir}/*/* %{_libdir}/alchemist/blackbox/*a %{_libdir}/alchemist/blackbox/*.so -%doc src/doc/html %changelog +* Tue Feb 12 2008 Tim Waugh 1.0.37-3 +- Removed HTML documentation to avoid multilib conflict (bug #340601). + Don't use alchemist in new software. + * Thu Aug 23 2007 Tim Waugh 1.0.37-2 - More specific license tag. Added dist tag. - Build requires gawk. From fcd28bd9cec75aea6eeec472b42f06a51a53c64c Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 13 Feb 2008 13:14:33 +0000 Subject: [PATCH 3/8] - Converted spec file to UTF-8 (bug #225240). - Removed use of PreReq and BuildPreReq (bug #225240). - Fixed summary (bug #225240). - Removed static libraries (bug #225240). --- alchemist.spec | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/alchemist.spec b/alchemist.spec index c420e2f..5455ec5 100644 --- a/alchemist.spec +++ b/alchemist.spec @@ -1,17 +1,17 @@ %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} -Summary: A multi-sourced configuration back-end. +Summary: A multi-sourced configuration back-end Name: alchemist Version: 1.0.37 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz -Prereq: /sbin/ldconfig +Requires(post,postun): /sbin/ldconfig Requires: libxml2 >= 2.3.8, libxslt >= 0.9.0 Requires: python-abi = %{pyver} -BuildPreReq: libxml2 >= 2.3.8, libxslt >= 0.9.0, libxslt-devel >= 0.9.0 -BuildPreReq: doxygen >= 1.2.7, python-devel, zlib-devel +BuildRequires: libxml2 >= 2.3.8, libxslt >= 0.9.0, libxslt-devel >= 0.9.0 +BuildRequires: doxygen >= 1.2.7, python-devel, zlib-devel BuildRequires: glib2-devel >= 2.0 BuildRequires: gawk BuildRoot: %{_tmppath}/%{name}-root @@ -70,14 +70,17 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ %files devel %defattr(-,root,root) %{_includedir}/alchemist -%{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/*.so %{_mandir}/*/* -%{_libdir}/alchemist/blackbox/*a %{_libdir}/alchemist/blackbox/*.so %changelog +* Wed Feb 13 2008 Tim Waugh 1.0.37-4 +- Converted spec file to UTF-8 (bug #225240). +- Removed use of PreReq and BuildPreReq (bug #225240). +- Fixed summary (bug #225240). +- Removed static libraries (bug #225240). + * Tue Feb 12 2008 Tim Waugh 1.0.37-3 - Removed HTML documentation to avoid multilib conflict (bug #340601). Don't use alchemist in new software. @@ -147,22 +150,22 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Fri Dec 13 2002 Elliot Lee 1.0.25-1 - Rebuild, fix bugs -* Wed Jul 10 2002 Trond Eivind Glomsrød 1.0.244 +* Wed Jul 10 2002 Trond Eivind Glomsrød 1.0.244 - Move the blackbox .a and .la file to the devel subpackage (#68461) -* Tue May 14 2002 Trond Eivind Glomsrød 1.0.24-1 +* Tue May 14 2002 Trond Eivind Glomsrød 1.0.24-1 - Back to Python 2.2 -* Tue Feb 26 2002 Trond Eivind Glomsrød 1.0.23-1 +* Tue Feb 26 2002 Trond Eivind Glomsrød 1.0.23-1 - rebuild -* Thu Jan 24 2002 Trond Eivind Glomsrød 1.0.22-1 +* Thu Jan 24 2002 Trond Eivind Glomsrød 1.0.22-1 - Make build with newer automake -* Thu Dec 13 2001 Trond Eivind Glomsrød 1.0.21-1 +* Thu Dec 13 2001 Trond Eivind Glomsrød 1.0.21-1 - Include .pyo files -* Fri Dec 7 2001 Trond Eivind Glomsrød 1.0.20-1 +* Fri Dec 7 2001 Trond Eivind Glomsrød 1.0.20-1 - s/Copyright/License/ - build for python 2.2 @@ -257,7 +260,7 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Tue Feb 13 2001 Crutcher Dunnavant - rebuilt for pknirsh's moveChild fix. (He should have written this changelog!) -* Fri Feb 9 2001 Trond Eivind Glomsrød +* Fri Feb 9 2001 Trond Eivind Glomsrød - Truncate files when opening for writing (ForgeBlackBox, FileBlackBox) * Thu Feb 08 2001 Harald Hoyer @@ -272,7 +275,7 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Wed Jan 24 2001 Crutcher Dunnavant - changed valid name to include '-' character -* Tue Jan 23 2001 Trond Eivind Glomsrød +* Tue Jan 23 2001 Trond Eivind Glomsrød - require 4Suite * Mon Jan 22 2001 Crutcher Dunnavant From 22e6dc728fb36092e65e774ecdf2e57a073cc571 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 13 Feb 2008 14:02:29 +0000 Subject: [PATCH 4/8] Fix build. --- alchemist.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alchemist.spec b/alchemist.spec index 5455ec5..5da6935 100644 --- a/alchemist.spec +++ b/alchemist.spec @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir} cd src doxygen cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ +rm -f $RPM_BUILD_ROOT/%{_libdir}/*a +rm -f $RPM_BUILD_ROOT/%{_libdir}/alchemist/blackbox/*a %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT From 668e7e7ec5cf5824edd5da171d0cc166157e1405 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 14 Feb 2008 13:07:23 +0000 Subject: [PATCH 5/8] Explanatory comment in place of URL tag. --- alchemist.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alchemist.spec b/alchemist.spec index 5da6935..8fd4b29 100644 --- a/alchemist.spec +++ b/alchemist.spec @@ -6,6 +6,8 @@ Version: 1.0.37 Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base +# No URL as this project never had an upstream other than Red Hat. +# Do not use alchemist in new projects. Source0: %{name}-%{version}.tar.gz Requires(post,postun): /sbin/ldconfig Requires: libxml2 >= 2.3.8, libxslt >= 0.9.0 From 27ed76284645df24415eba335acb8e903c92aff8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:28:12 +0000 Subject: [PATCH 6/8] Initialize branch F-10 for alchemist --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From ccb455920feb9b401f3d9f373d7df7aa19b4309a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:56 +0000 Subject: [PATCH 7/8] 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 c79500c..afcea92 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := alchemist 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 2f12e50b9860dc05cf3ac09c1cd82b45fae28637 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:40:48 +0000 Subject: [PATCH 8/8] 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 afcea92..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alchemist -# $Id$ -NAME := alchemist -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),) -# attempt 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10