From a66aa85de62f93c95b1c4f24689cf03173a328d7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 May 2008 16:08:39 +0000 Subject: [PATCH 1/6] Initialize branch F-9 for virt-df --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From c7393dfd7f6feaedc72914a00eec8e2a699d35a2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2008 16:35:33 +0000 Subject: [PATCH 2/6] Initial import. --- .cvsignore | 1 + sources | 1 + virt-df-requires-bitmatch.patch | 24 ++++ virt-df.spec | 209 ++++++++++++++++++++++++++++++++ 4 files changed, 235 insertions(+) create mode 100644 virt-df-requires-bitmatch.patch create mode 100644 virt-df.spec diff --git a/.cvsignore b/.cvsignore index e69de29..1dd53cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +virt-df-2.1.1.tar.gz diff --git a/sources b/sources index e69de29..56d1c96 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a50f8d1db626527664293a737e3827c1 virt-df-2.1.1.tar.gz diff --git a/virt-df-requires-bitmatch.patch b/virt-df-requires-bitmatch.patch new file mode 100644 index 0000000..bad9b57 --- /dev/null +++ b/virt-df-requires-bitmatch.patch @@ -0,0 +1,24 @@ +--- a/diskzip/Makefile.in Sun May 18 17:39:30 2008 +0100 ++++ b/diskzip/Makefile.in Sun May 18 23:38:18 2008 +0100 +@@ -38,7 +38,7 @@ OBJS := diskzip_gettext.cmo diskzip.cmo + OBJS := diskzip_gettext.cmo diskzip.cmo + XOBJS := $(OBJS:.cmo=.cmx) + +-SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo" ++SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" + + OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) + #OCAMLCLIBS := -linkpkg diskimage.cma + +--- a/lib/Makefile.in Sun May 18 17:39:30 2008 +0100 ++++ b/lib/Makefile.in Sun May 18 23:38:18 2008 +0100 +@@ -55,7 +55,7 @@ XOBJS := $(OBJS:.cmo=.cmx) + + #---------------------------------------------------------------------- + +-SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo" ++SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo" + + OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX) + #OCAMLCLIBS := -linkpkg + diff --git a/virt-df.spec b/virt-df.spec new file mode 100644 index 0000000..3c46282 --- /dev/null +++ b/virt-df.spec @@ -0,0 +1,209 @@ +%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +%define debug_package %{nil} + +Name: virt-df +Version: 2.1.1 +Release: 6%{?dist} +Summary: Utility like 'df' for virtual guests + +Group: Development/Libraries +License: GPLv2+ +URL: http://et.redhat.com/~rjones/virt-df/ +Source0: http://et.redhat.com/~rjones/virt-df/files/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch0: virt-df-requires-bitmatch.patch + +BuildRequires: ocaml >= 3.10.0 +BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-extlib-devel +BuildRequires: ocaml-csv-devel +BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-bitmatch-devel >= 0.9 +BuildRequires: ocaml-xml-light-devel +BuildRequires: ocaml-libvirt-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 + +%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-df is df for virtual guests. Run the program on the host / dom0 +to display disk space used and available on all partitions on all +guests. + + +%prep +%setup -q +# http://hg.et.redhat.com/virt/applications/virt-df--devel?cs=00a35ad4c881 +%patch0 -p1 + + +%build +CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --prefix=%{_prefix} + +rm */.depend +make depend + +make all +%if %opt +make opt +strip virt-df/virt-df.opt +%endif + +# Build translations. +make -C po + +# Force rebuild of man page. +rm virt-df/virt-df.1 +make -C virt-df virt-df.1 + + +%install +rm -rf $RPM_BUILD_ROOT +make -C virt-df 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} + +# Install virt-df manpage by hand for now. +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING README ChangeLog +%{_bindir}/virt-df +%{_mandir}/man1/virt-df.1* + + +%changelog +* Sun May 18 2008 Richard W.M. Jones - 2.1.1-6 +- Include upstream cset 00a35ad4c881 which fixes build with + latest bitmatch. + +* Fri May 16 2008 Richard W.M. Jones - 2.1.1-5 +- Reenable ocaml-gettext-devel BR and get it working properly. +- Use find_lang to find PO files. +- +BR ocaml-fileutils-devel (not strictly needed, but a dependency + of gettext). +- +BR ocaml-camomile-data except on ppc64. + +* Tue May 13 2008 Richard W.M. Jones - 2.1.1-1 +- New upstream version 2.1.1. +- Needs bitmatch >= 0.9. + +* Thu May 1 2008 Richard W.M. Jones - 2.0.2-1 +- New upstream version 2.0.2. +- Don't depend on ocaml-gettext, it's not used at the moment. +- Don't gzip the manpage, it happens automagically. +- This version needs bitmatch >= 0.5. +- +BR ocaml-xml-light-devel +- +BR ocaml-camlp4-devel + +* Thu Apr 17 2008 Richard W.M. Jones - 2.0.0-3 +- Build with additional CSV support. + +* Thu Apr 17 2008 Richard W.M. Jones - 2.0.0-2 +- New upstream release 2.0.0. +- BR ocaml-libvirt-devel. + +* 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 4532858fddcea592e773698a2e5cffa682901bbb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 22 May 2008 11:06:38 +0000 Subject: [PATCH 3/6] - Remove ocaml-gettext dep, not available in F-9. --- virt-df.spec | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/virt-df.spec b/virt-df.spec index 3c46282..14c5af4 100644 --- a/virt-df.spec +++ b/virt-df.spec @@ -3,7 +3,7 @@ Name: virt-df Version: 2.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -24,13 +24,6 @@ BuildRequires: ocaml-bitmatch-devel >= 0.9 BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-libvirt-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 @@ -64,9 +57,6 @@ make opt strip virt-df/virt-df.opt %endif -# Build translations. -make -C po - # Force rebuild of man page. rm virt-df/virt-df.1 make -C virt-df virt-df.1 @@ -76,11 +66,6 @@ make -C virt-df virt-df.1 rm -rf $RPM_BUILD_ROOT make -C virt-df 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} - # Install virt-df manpage by hand for now. mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1 @@ -90,7 +75,7 @@ install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1 rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/virt-df @@ -98,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 22 2008 Richard W.M. Jones - 2.1.1-7 +- Remove ocaml-gettext dep, not available in F-9. + * Sun May 18 2008 Richard W.M. Jones - 2.1.1-6 - Include upstream cset 00a35ad4c881 which fixes build with latest bitmatch. From 441632d87be2d7aaf24da52bab138d994e6dbb1d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 Jun 2008 08:48:31 +0000 Subject: [PATCH 4/6] - Bump version to fix package EVR problems between branches --- virt-df.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-df.spec b/virt-df.spec index 14c5af4..9f07f0d 100644 --- a/virt-df.spec +++ b/virt-df.spec @@ -3,7 +3,7 @@ Name: virt-df Version: 2.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 12 2008 Richard W.M. Jones - 2.1.1-8 +- Bump version to fix package EVR problems between branches + * Thu May 22 2008 Richard W.M. Jones - 2.1.1-7 - Remove ocaml-gettext dep, not available in F-9. From e4436456e3e5190e92294fb6ad8e74f45dc67013 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:29 +0000 Subject: [PATCH 5/6] 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 bc15d3b..a13e7d4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: virt-df -# $Id$ +# $Id: Makefile,v 1.1 2008/05/19 16:08:22 kevin Exp $ NAME := virt-df 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 b04e73ac729a5f020b998e78e508a384078d4570 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:04:41 +0000 Subject: [PATCH 6/6] 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 a13e7d4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virt-df -# $Id: Makefile,v 1.1 2008/05/19 16:08:22 kevin Exp $ -NAME := virt-df -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9