From 871f2336c3157191512be5fdbf111cf001702153 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 15 Oct 2008 21:53:43 +0000 Subject: [PATCH 01/10] Initialize branch F-10 for ace --- 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 2cb3f30c2acf8663b565d1a7a23de714b21c4201 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Tue, 25 Nov 2008 20:06:19 +0000 Subject: [PATCH 02/10] Initial checkin --- .cvsignore | 1 + ace.spec | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 269 insertions(+) create mode 100644 ace.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..f76dd0f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +ace-0.0.3.tar.gz diff --git a/ace.spec b/ace.spec new file mode 100644 index 0000000..7624a4c --- /dev/null +++ b/ace.spec @@ -0,0 +1,266 @@ +%define ruby_sitelibdir %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%define pbuild %{_builddir}/%{name}-%{version} +%define binFile %{_bindir}/ace +%define initFile %{_initrddir}/ace +%define acehome %{_datadir}/ace +%define modulehome %{acehome}/modules + + +############## +# Main Module +############## +Summary: Appliance Configuration Engine +Name: ace +Version: 0.0.3 +Release: 5%{?dist} + +Group: Applications/Internet +License: LGPLv2+ +URL: http://www.thincrust.net +Source0: %{url}/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: yum +Requires: ruby(abi) = 1.8 +Requires: puppet +Requires: ruby-augeas +Requires: /usr/sbin/crond +Requires(post): chkconfig +Requires(preun): chkconfig + +%description +Boot time configuration engine for appliances. + +%files +%defattr(-,root,root,-) +%dir %{ruby_sitelibdir} +%dir %{modulehome}/appliance_base +%dir %{modulehome}/augeas +%dir %{modulehome}/firewall +%dir %{acehome}/facts +%dir %{acehome}/lenses +%dir %{acehome}/manifests +%dir %{acehome}/tools +%{modulehome}/appliance_base/* +%{modulehome}/augeas/* +%{modulehome}/firewall/* +%{acehome}/facts/* +%{acehome}/lenses/* +%{acehome}/manifests/* +%{acehome}/tools/* +%{ruby_sitelibdir}/* +%doc %{acehome}/COPYING +%{binFile} +%{initFile} + + +############### +# Apache Module +############### +%package apache +Summary: Apache ACE Module + +Group: Applications/Internet +License: LGPLv2+ +URL: http://www.thincrust.net +BuildArch: noarch +Requires: ace +Requires: httpd +Requires: ruby(abi) = 1.8 + +%description apache +Apache module for the Appliance Configuration Engine + +%files apache +%defattr(-,root,root,-) +%{modulehome}/apache/* +%doc %{modulehome}/apache/COPYING + + + +################# +# Banners Module +################# +%package banners +Summary: Simple Banners ACE Module +Group: Applications/Internet +Requires: ace +Requires: ruby(abi) = 1.8 + +%description banners +Login and Console information for appliances + +%files banners +%defattr(-,root,root,-) +%{modulehome}/banners/* +%doc %{modulehome}/banners/COPYING + + +#################### +# Basic Site Module +#################### +%package basic-site +Summary: Simple Web Site ACE Module +Group: Applications/Internet +Requires: ace-apache +Requires: ruby(abi) = 1.8 + +%description basic-site +Basic informative web site for appliances + +%files basic-site +%defattr(-,root,root,-) +%{modulehome}/basic-site/* +%doc %{modulehome}/basic-site/COPYING + + +############## +# MySQL Module +############## +%package mysql +Summary: ACE Mysql module +Group: Applications/Internet +Requires: ruby(abi) = 1.8 +Requires: ace +Requires: mysql +Requires: mysql-server + +%description mysql +Mysql management for appliances. + +%files mysql +%defattr(-,root,root,-) +%{modulehome}/mysql/* +%doc %{modulehome}/mysql/COPYING + + + +############## +# PHP Module +############## +%package php +Summary: ACE php module +Group: Applications/Internet +Requires: ruby(abi) = 1.8 +Requires: ace +Requires: php + +%description php +PHP management for appliances. + +%files php +%defattr(-,root,root,-) +%{modulehome}/php/* +%doc %{modulehome}/php/COPYING + + +################# +# Postgres Module +################# +%package postgres +Summary: ACE postgres module +Group: Applications/Internet +Requires: ruby(abi) = 1.8 +Requires: ace +Requires: postgresql +Requires: postgresql-server + +%description postgres +Postgres database management for appliances. + +%files postgres +%defattr(-,root,root,-) +%{modulehome}/postgres/* +%doc %{modulehome}/postgres/COPYING + + + +############ +# SSH Module +############ +%package ssh +Summary: ACE ssh module +Group: Applications/Internet +Requires: ruby(abi) = 1.8 +Requires: ace +Requires: openssh-server + +%description ssh +SSH configuration for appliances + +%files ssh +%defattr(-,root,root,-) +%{modulehome}/ssh/* +%doc %{modulehome}/ssh/COPYING + + + +########################### +# Prep, Build, and Install +########################### +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +install -d %{buildroot}/%{acehome} +install -d %{buildroot}/%{ruby_sitelibdir} +install -d %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_initrddir} +cp -pr %{pbuild}/COPYING %{buildroot}/%{acehome} +cp -pr %{pbuild}/lib/ace.rb %{buildroot}/%{ruby_sitelibdir} +cp -pr %{pbuild}/lib/ace %{buildroot}/%{ruby_sitelibdir} +cp -pr %{pbuild}/bin/ace %{buildroot}/%{binFile} +cp -pr %{pbuild}/bin/ace-init %{buildroot}/%{initFile} +cp -pr %{pbuild}/modules %{buildroot}/%{acehome} +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/apache +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/banners +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/basic-site +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/mysql +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/php +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/postgres +cp -pr %{pbuild}/COPYING %{buildroot}/%{modulehome}/ssh +cp -pr %{pbuild}/facts %{buildroot}/%{acehome} +cp -pr %{pbuild}/manifests %{buildroot}/%{acehome} +cp -pr %{pbuild}/tools %{buildroot}/%{acehome} +cp -pr %{pbuild}/lenses %{buildroot}/%{acehome} + +%clean +rm -rf %{buildroot} + +%post +/sbin/chkconfig --add %{name} + +%preun +if [ $1 = 0 ] ; then + /sbin/service ace stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi + + +########### +# Changelog +########### +%changelog +* Thu Oct 2 2008 Bryan Kearney 0.0.3-5 +- Remove the console to package it later. + +* Thu Oct 2 2008 Bryan Kearney 0.0.3-4 +- Combine all ace packages into a single SRPM. + +* Wed Sep 24 2008 Bryan Kearney 0.0.3-3 +- Comments from David Lutterkort and Bill Nottingham + +* Fri Sep 19 2008 Bryan Kearney 0.0.3-2 +- Submit For Fedora Packaging Process + +* Thu Sep 18 2008 Bryan Kearney 0.0.3-1 +- Begin Fedora Packaging Process + +* Thu Jul 17 2008 Bryan Kearney 0.0.2-1 +- Converted to puppet syntax + +* Thu Mar 26 2008 Bryan Kearney 0.0.1-1 +- Initial packaging diff --git a/import.log b/import.log new file mode 100644 index 0000000..412deae --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 diff --git a/sources b/sources index e69de29..4770c8e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4472ecd60433a87b25a3be89fbdb272a ace-0.0.3.tar.gz From 9fd88091d7f5d43a3c7ae3f4ab157fdb23777943 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Tue, 2 Dec 2008 21:05:26 +0000 Subject: [PATCH 03/10] Bring in the latest build which fixes the location of the main ruby files --- ace.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ace.spec b/ace.spec index 7624a4c..23cd2ee 100644 --- a/ace.spec +++ b/ace.spec @@ -1,4 +1,4 @@ -%define ruby_sitelibdir %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define pbuild %{_builddir}/%{name}-%{version} %define binFile %{_bindir}/ace %define initFile %{_initrddir}/ace @@ -12,7 +12,7 @@ Summary: Appliance Configuration Engine Name: ace Version: 0.0.3 -Release: 5%{?dist} +Release: 7%{?dist} Group: Applications/Internet License: LGPLv2+ @@ -20,6 +20,9 @@ URL: http://www.thincrust.net Source0: %{url}/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: ruby(abi) = 1.8 +BuildRequires: ruby-devel >= 1.8 +BuildRequires: ruby Requires: yum Requires: ruby(abi) = 1.8 Requires: puppet @@ -33,7 +36,7 @@ Boot time configuration engine for appliances. %files %defattr(-,root,root,-) -%dir %{ruby_sitelibdir} +%dir %{ruby_sitelib} %dir %{modulehome}/appliance_base %dir %{modulehome}/augeas %dir %{modulehome}/firewall @@ -48,7 +51,7 @@ Boot time configuration engine for appliances. %{acehome}/lenses/* %{acehome}/manifests/* %{acehome}/tools/* -%{ruby_sitelibdir}/* +%{ruby_sitelib}/* %doc %{acehome}/COPYING %{binFile} %{initFile} @@ -206,12 +209,12 @@ SSH configuration for appliances %install rm -rf %{buildroot} install -d %{buildroot}/%{acehome} -install -d %{buildroot}/%{ruby_sitelibdir} +install -d %{buildroot}/%{ruby_sitelib} install -d %{buildroot}/%{_bindir} install -d %{buildroot}/%{_initrddir} cp -pr %{pbuild}/COPYING %{buildroot}/%{acehome} -cp -pr %{pbuild}/lib/ace.rb %{buildroot}/%{ruby_sitelibdir} -cp -pr %{pbuild}/lib/ace %{buildroot}/%{ruby_sitelibdir} +cp -pr %{pbuild}/lib/ace.rb %{buildroot}/%{ruby_sitelib} +cp -pr %{pbuild}/lib/ace %{buildroot}/%{ruby_sitelib} cp -pr %{pbuild}/bin/ace %{buildroot}/%{binFile} cp -pr %{pbuild}/bin/ace-init %{buildroot}/%{initFile} cp -pr %{pbuild}/modules %{buildroot}/%{acehome} @@ -244,6 +247,12 @@ fi # Changelog ########### %changelog +* Tue Dec 2 2008 Bryan Kearney 0.0.3-7 +- Modify the build requires to include the ruby binary + +* Tue Dec 2 2008 Bryan Kearney 0.0.3-6 +- Modify the build requires to get the sitelibdir value + * Thu Oct 2 2008 Bryan Kearney 0.0.3-5 - Remove the console to package it later. From 30bb234a70d5ce35bc0dd6c0431a2dde7821db61 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Tue, 16 Dec 2008 21:39:52 +0000 Subject: [PATCH 04/10] Fixes some bugs in the postgres plugin around dependencies. Found while testing ovirt. --- .cvsignore | 2 +- ace.spec | 13 +++++++++++-- import.log | 1 + sources | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f76dd0f..d9503e5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ace-0.0.3.tar.gz +ace-0.0.4.tar.gz diff --git a/ace.spec b/ace.spec index 23cd2ee..63a23fb 100644 --- a/ace.spec +++ b/ace.spec @@ -11,8 +11,8 @@ ############## Summary: Appliance Configuration Engine Name: ace -Version: 0.0.3 -Release: 7%{?dist} +Version: 0.0.4 +Release: 1%{?dist} Group: Applications/Internet License: LGPLv2+ @@ -37,6 +37,8 @@ Boot time configuration engine for appliances. %files %defattr(-,root,root,-) %dir %{ruby_sitelib} +%dir %{acehome} +%dir %{modulehome} %dir %{modulehome}/appliance_base %dir %{modulehome}/augeas %dir %{modulehome}/firewall @@ -76,6 +78,7 @@ Apache module for the Appliance Configuration Engine %files apache %defattr(-,root,root,-) +%dir %{modulehome}/apache %{modulehome}/apache/* %doc %{modulehome}/apache/COPYING @@ -95,6 +98,7 @@ Login and Console information for appliances %files banners %defattr(-,root,root,-) +%dir %{modulehome}/banners %{modulehome}/banners/* %doc %{modulehome}/banners/COPYING @@ -113,6 +117,7 @@ Basic informative web site for appliances %files basic-site %defattr(-,root,root,-) +%dir %{modulehome}/basic-site %{modulehome}/basic-site/* %doc %{modulehome}/basic-site/COPYING @@ -133,6 +138,7 @@ Mysql management for appliances. %files mysql %defattr(-,root,root,-) +%dir %{modulehome}/mysql %{modulehome}/mysql/* %doc %{modulehome}/mysql/COPYING @@ -153,6 +159,7 @@ PHP management for appliances. %files php %defattr(-,root,root,-) +%dir %{modulehome}/php %{modulehome}/php/* %doc %{modulehome}/php/COPYING @@ -173,6 +180,7 @@ Postgres database management for appliances. %files postgres %defattr(-,root,root,-) +%dir %{modulehome}/postgres %{modulehome}/postgres/* %doc %{modulehome}/postgres/COPYING @@ -193,6 +201,7 @@ SSH configuration for appliances %files ssh %defattr(-,root,root,-) +%dir %{modulehome}/ssh %{modulehome}/ssh/* %doc %{modulehome}/ssh/COPYING diff --git a/import.log b/import.log index 412deae..7d699ec 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 +ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881 diff --git a/sources b/sources index 4770c8e..5821758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4472ecd60433a87b25a3be89fbdb272a ace-0.0.3.tar.gz +9870c9bab904e8a6640b9a9beeed9f41 ace-0.0.4.tar.gz From d32c0140204d6bca188857e3e601a84e7b42f438 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Tue, 16 Dec 2008 22:00:57 +0000 Subject: [PATCH 05/10] new changelog --- ace.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ace.spec b/ace.spec index 63a23fb..2631085 100644 --- a/ace.spec +++ b/ace.spec @@ -256,6 +256,10 @@ fi # Changelog ########### %changelog +* Tue Dec 16 2008 Bryan Kearney 0.0.4-1 +- Postgres packages did not enforfce dependencies correctly +- init script can handle many appliances + * Tue Dec 2 2008 Bryan Kearney 0.0.3-7 - Modify the build requires to include the ruby binary From 508d49683bbd714baa164e1b3615103c7c866ca5 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Wed, 7 Jan 2009 14:24:41 +0000 Subject: [PATCH 06/10] - Status of puppet script is reflected in command line and init script - Executingn 'ace --verbose' now provides real time view of puppet output - Will work with new puppet which includes the augas plugin --- .cvsignore | 2 +- ace.spec | 13 +++++++++---- import.log | 1 + sources | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d9503e5..3deaba4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ace-0.0.4.tar.gz +ace-0.0.5.tar.gz diff --git a/ace.spec b/ace.spec index 2631085..10ade85 100644 --- a/ace.spec +++ b/ace.spec @@ -11,7 +11,7 @@ ############## Summary: Appliance Configuration Engine Name: ace -Version: 0.0.4 +Version: 0.0.5 Release: 1%{?dist} Group: Applications/Internet @@ -20,9 +20,9 @@ URL: http://www.thincrust.net Source0: %{url}/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: ruby(abi) = 1.8 -BuildRequires: ruby-devel >= 1.8 -BuildRequires: ruby +BuildRequires: ruby(abi) = 1.8 +BuildRequires: ruby-devel >= 1.8 +BuildRequires: ruby Requires: yum Requires: ruby(abi) = 1.8 Requires: puppet @@ -256,6 +256,11 @@ fi # Changelog ########### %changelog +* Tue Jan 07 2009 Bryan Kearney 0.0.5-1 +- Status of puppet script is reflected in command line and init script +- Executingn 'ace --verbose' now provides real time view of puppet output +- Will work with new puppet which includes the augas plugin + * Tue Dec 16 2008 Bryan Kearney 0.0.4-1 - Postgres packages did not enforfce dependencies correctly - init script can handle many appliances diff --git a/import.log b/import.log index 7d699ec..65e8135 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881 +ace-0_0_5-1_fc10:F-10:ace-0.0.5-1.fc10.src.rpm:1231337987 diff --git a/sources b/sources index 5821758..1061664 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9870c9bab904e8a6640b9a9beeed9f41 ace-0.0.4.tar.gz +a89ca5cf9a73bc6229737f43fe7efdbe ace-0.0.5.tar.gz From e7f4e1df09436b6cec768aede621411cce5f3e94 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Wed, 18 Feb 2009 14:53:22 +0000 Subject: [PATCH 07/10] Added ip tables fix from boggs --- .cvsignore | 2 +- ace.spec | 2 +- import.log | 1 + sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3deaba4..965b8ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ace-0.0.5.tar.gz +ace-0.0.6.tar.gz diff --git a/ace.spec b/ace.spec index 10ade85..7637a97 100644 --- a/ace.spec +++ b/ace.spec @@ -11,7 +11,7 @@ ############## Summary: Appliance Configuration Engine Name: ace -Version: 0.0.5 +Version: 0.0.6 Release: 1%{?dist} Group: Applications/Internet diff --git a/import.log b/import.log index 65e8135..001517b 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881 ace-0_0_5-1_fc10:F-10:ace-0.0.5-1.fc10.src.rpm:1231337987 +ace-0_0_6-1_fc10:F-10:ace-0.0.6-1.fc10.src.rpm:1234967780 diff --git a/sources b/sources index 1061664..9b2d9b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a89ca5cf9a73bc6229737f43fe7efdbe ace-0.0.5.tar.gz +a568f616f25cb6f6f8703121bf449bde ace-0.0.6.tar.gz From 7d1941a8648fda5d66838c08788c7e372c211194 Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Mon, 16 Mar 2009 18:32:08 +0000 Subject: [PATCH 08/10] Changes from Joey Boggs and the ovirt team. --- .cvsignore | 2 +- ace.spec | 13 +++++++++++-- import.log | 1 + sources | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 965b8ba..e6a77c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ace-0.0.6.tar.gz +ace-0.0.7.tar.gz diff --git a/ace.spec b/ace.spec index 7637a97..e2c1c58 100644 --- a/ace.spec +++ b/ace.spec @@ -11,8 +11,8 @@ ############## Summary: Appliance Configuration Engine Name: ace -Version: 0.0.6 -Release: 1%{?dist} +Version: 0.0.7 +Release: 2%{?dist} Group: Applications/Internet License: LGPLv2+ @@ -256,6 +256,15 @@ fi # Changelog ########### %changelog +* Wed Mar 16 2009 Bryan Kearney 0.0.7-2 +- Ovirt enhancements from Joey Boggs + +* Mon Feb 23 2009 Fedora Release Engineering - 0.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 Bryan Kearney 0.0.6-1 +- Iptables enhancements from Joey Boggs + * Tue Jan 07 2009 Bryan Kearney 0.0.5-1 - Status of puppet script is reflected in command line and init script - Executingn 'ace --verbose' now provides real time view of puppet output diff --git a/import.log b/import.log index 001517b..1e14cbc 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881 ace-0_0_5-1_fc10:F-10:ace-0.0.5-1.fc10.src.rpm:1231337987 ace-0_0_6-1_fc10:F-10:ace-0.0.6-1.fc10.src.rpm:1234967780 +ace-0_0_7-2_fc10:F-10:ace-0.0.7-2.fc10.src.rpm:1237228066 diff --git a/sources b/sources index 9b2d9b5..a92309a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a568f616f25cb6f6f8703121bf449bde ace-0.0.6.tar.gz +7d894e1385a9f8b41ad74c57fbcfe644 ace-0.0.7.tar.gz From 8ee38c15c26f2229840185da61870043ea413e0b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:37 +0000 Subject: [PATCH 09/10] 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 98a83d8..392a0a3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ace 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 1fe51030310fb327b3303883ada6d6a8662d4a71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:34:00 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 5 ----- 4 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 392a0a3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ace -# $Id$ -NAME := ace -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 1e14cbc..0000000 --- a/import.log +++ /dev/null @@ -1,5 +0,0 @@ -ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185 -ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881 -ace-0_0_5-1_fc10:F-10:ace-0.0.5-1.fc10.src.rpm:1231337987 -ace-0_0_6-1_fc10:F-10:ace-0.0.6-1.fc10.src.rpm:1234967780 -ace-0_0_7-2_fc10:F-10:ace-0.0.7-2.fc10.src.rpm:1237228066