From ea7fb8886e2d917e5a18765fc01c8de9e4039928 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:39:45 +0000 Subject: [PATCH 1/7] Initialize branch F-11 for virt-ctrl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 61b06589dcfefdda0b6f4a3c186a907444f7993b Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Apr 2009 09:26:13 +0000 Subject: [PATCH 2/7] - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) --- virt-ctrl.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/virt-ctrl.spec b/virt-ctrl.spec index c9a0f75..580e71b 100644 --- a/virt-ctrl.spec +++ b/virt-ctrl.spec @@ -11,6 +11,7 @@ License: GPLv2+ URL: http://et.redhat.com/~rjones/virt-ctrl/ Source0: http://et.redhat.com/~rjones/virt-ctrl/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc @@ -93,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bb7581c82456bdf34bd7065b05100f7551b6db5b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:54:34 +0000 Subject: [PATCH 3/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- virt-ctrl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-ctrl.spec b/virt-ctrl.spec index 580e71b..279f730 100644 --- a/virt-ctrl.spec +++ b/virt-ctrl.spec @@ -3,7 +3,7 @@ Name: virt-ctrl Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Graphical management app for virtual machines Group: Development/Libraries @@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Apr 16 2009 S390x secondary arch maintainer - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) From 4c634119e64b40ba7c465201805d5a52f6c1aff7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 19 Nov 2009 09:52:48 +0000 Subject: [PATCH 4/7] Removed this package - obsolete. Use virt-manager instead. --- Makefile | 21 ----- dead.package | 1 + import.log | 1 - sources | 1 - virt-ctrl.spec | 207 ------------------------------------------------- 5 files changed, 1 insertion(+), 230 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 import.log delete mode 100644 sources delete mode 100644 virt-ctrl.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 1a0604b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virt-ctrl -# $Id$ -NAME := virt-ctrl -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 -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/dead.package b/dead.package new file mode 100644 index 0000000..e26b05f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package is obsolete. Use virt-manager instead. diff --git a/import.log b/import.log deleted file mode 100644 index cec7adb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virt-ctrl-1_0_1-1_fc10:HEAD:virt-ctrl-1.0.1-1.fc10.src.rpm:1225982922 diff --git a/sources b/sources deleted file mode 100644 index a89e798..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -4621c70c6cf4e1ace57700ed82367e54 virt-ctrl-1.0.1.tar.gz diff --git a/virt-ctrl.spec b/virt-ctrl.spec deleted file mode 100644 index 279f730..0000000 --- a/virt-ctrl.spec +++ /dev/null @@ -1,207 +0,0 @@ -%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%define debug_package %{nil} - -Name: virt-ctrl -Version: 1.0.1 -Release: 4%{?dist} -Summary: Graphical management app for virtual machines - -Group: Development/Libraries -License: GPLv2+ -URL: http://et.redhat.com/~rjones/virt-ctrl/ -Source0: http://et.redhat.com/~rjones/virt-ctrl/files/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: sparc64 s390 s390x - -BuildRequires: ocaml >= 3.10.0 -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-lablgtk-devel >= 2.10.0 -BuildRequires: gtk2-devel -BuildRequires: gnome-icon-theme -BuildRequires: ocaml-dbus-devel >= 0.06 -BuildRequires: dbus-devel -BuildRequires: ocaml-libvirt-devel -BuildRequires: ocaml-xml-light-devel -BuildRequires: ocaml-extlib-devel - -# Tortuous list of BRs for gettext. -BuildRequires: ocaml-gettext-devel >= 0.3.0 -BuildRequires: ocaml-fileutils-devel -%ifnarch ppc64 -BuildRequires: ocaml-camomile-data -%endif - -# Non-OCaml BRs. -BuildRequires: libvirt-devel >= 0.2.1 -BuildRequires: perl -BuildRequires: gawk - -Requires: virt-viewer - -#%define _use_internal_dependency_generator 0 -#%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -#%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh - -%description -Virt-ctrl is a graphical management app for virtual machines, modelled -after Virtual Machine Manager, but much more lightweight. - - -%prep -%setup -q - -#pushd po -## Original po/Makefile.in has an incorrect package name, and -## the list of POTFILES is wrong. -#mv Makefile.in Makefile.in.orig -#sed 's/^\(OCAML_GETTEXT_PACKAGE\) = .*/\1 = virt-ctrl/' \ -# < Makefile.in.orig > Makefile.in -#find .. -name '*.ml' > POTFILES -#popd - - -%build -%configure -make all -%if %opt -make opt -strip virt-ctrl/virt-ctrl.opt -%endif - -# Build translations. -make -C po - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# Install translations. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale -make -C po install PODIR="$RPM_BUILD_ROOT%{_datadir}/locale" -%find_lang %{name} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc COPYING README ChangeLog -%{_bindir}/virt-ctrl - - -%changelog -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Apr 16 2009 S390x secondary arch maintainer -- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs - (added sparc64 per request from the sparc maintainer) - -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Nov 26 2008 Richard W.M. Jones - 1.0.1-2 -- Rebuild for OCaml 3.11.0+rc1. - -* Thu Nov 6 2008 Richard W.M. Jones - 1.0.1-1 -- New upstream version 1.0.1. -- Adding to Fedora. - -* Mon May 19 2008 Richard W.M. Jones - 1.0.0-3 -- Use RPM percent-configure. -- Fix po/Makefile.in and po/POTFILES. -- Add list of BRs for ocaml-gettext. -- Use find_lang to find PO files. -- Comment out OCaml dependency generator (not a lib, not needed). -- Check it builds in Koji. - -* Tue Apr 22 2008 Richard W.M. Jones - 1.0.0-2 -- Added BRs ocaml-xml-light-devel and ocaml-extlib-devel. -- Added Requires virt-viewer. - -* Thu Apr 17 2008 Richard W.M. Jones - 1.0.0-1 -- New upstream version 1.0.0. - -* Tue Mar 19 2008 Richard W.M. Jones - 0.4.1.1-1 -- New upstream release 0.4.1.1. -- Move configure to build section. -- Pass RPM_OPT_FLAGS. - -* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-2 -- Fix source URL. -- Install virt-df manpage. - -* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 -- New upstream release 0.4.1.0. -- Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, - ocaml-dbus-devel. -- Enable virt-df. - -* Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 -- Rebuild for ppc64. - -* Wed Feb 13 2008 Richard W.M. Jones - 0.4.0.3-2 -- Add BR gtk2-devel - -* Tue Feb 12 2008 Richard W.M. Jones - 0.4.0.3-1 -- New upstream version 0.4.0.3. -- Rebuild for OCaml 3.10.1. - -* Tue Nov 20 2007 Richard W.M. Jones - 0.3.3.4-1 -- New upstream release 0.3.3.4. -- Upstream website is now http://libvirt.org/ocaml/ - -* Fri Oct 19 2007 Richard W.M. Jones - 0.3.3.0-2 -- Mistake: BR is ocaml-calendar-devel. - -* Fri Oct 19 2007 Richard W.M. Jones - 0.3.3.0-1 -- New upstream release 0.3.3.0. -- Added support for virt-df, but disabled it by default. -- +BR ocaml-calendar. - -* Mon Sep 24 2007 Richard W.M. Jones - 0.3.2.8-1 -- New upstream release 0.3.2.8. - -* Thu Sep 20 2007 Richard W.M. Jones - 0.3.2.7-1 -- New upstream release 0.3.2.7. -- Ship the upstream ChangeLog file. - -* Thu Sep 6 2007 Richard W.M. Jones - 0.3.2.6-2 -- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides - scripts. - -* Thu Sep 6 2007 Richard W.M. Jones - 0.3.2.6-1 -- New upstream version 0.3.2.6. - -* Wed Aug 29 2007 Richard W.M. Jones - 0.3.2.5-1 -- New upstream version 0.3.2.5. -- Keep TODO out of the main package, but add (renamed) TODO.libvirt and - TODO.virt-top to the devel and virt-top packages respectively. -- Add BR gawk. - -* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.4-1 -- New upstream version 0.3.2.4. - -* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.3-2 -- build_* macros so we can choose what subpackages to build. - -* Thu Aug 23 2007 Richard W.M. Jones - 0.3.2.3-1 -- Upstream version 0.3.2.3. -- Add missing BR libvirt-devel. - -* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.2-1 -- Upstream version 0.3.2.2. - -* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.1-2 -- Fix unclosed if-statement in spec file. - -* Wed Aug 22 2007 Richard W.M. Jones - 0.3.2.1-1 -- Upstream version 0.3.2.1. -- Put HTML documentation in -devel package. - -* Mon Aug 6 2007 Richard W.M. Jones - 0.3.1.2-1 -- Initial RPM release. From 3559bd726be562b4ab1af044b9ae3efe9da031d7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:27 +0000 Subject: [PATCH 5/7] 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 1a0604b..c9ac158 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := virt-ctrl 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 9b242cdeaaa3c38bccf055f6222b1c51563f47f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:04:38 +0000 Subject: [PATCH 6/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 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 c9ac158..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virt-ctrl -# $Id$ -NAME := virt-ctrl -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index cec7adb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virt-ctrl-1_0_1-1_fc10:HEAD:virt-ctrl-1.0.1-1.fc10.src.rpm:1225982922 From 77bf847b007ca6a284fdb3fa4b39fe54a7ef9c6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:04:38 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore