Changes to build / RPM build:

 - Build RPM from tarball.
 - Install message catalogs in RPM.
 - virt-p2v has new local repo (p2vrepo).
 - rpmbuild/ subdirectory is just used for RPM builds.
 - Exclude docs from packages.

diff --git a/.hgignore b/.hgignore
index 855f5c4..51cbacf 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,7 @@
 ^tftpboot/
 ^localrepo/
 ^rpmbuild/
+^p2vrepo/
 ^virt-p2v.spec$
 ^virt-p2v$
 ^po/Makefile$
\ No newline at end of file

diff --git a/Makefile.in b/Makefile.in
index f5df4b4..1e7dd60 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,23 +62,26 @@ endif
 
 # Build RPM of virt-p2v.
 
-rpm:   checknotroot rpmbuild/$(VIRTP2V_RPM)
+rpm:   checknotroot p2vrepo/$(VIRTP2V_RPM)
 
 RPM_FLAGS := --define "_topdir       %(pwd)/rpmbuild" \
-            --define "_builddir     %{_topdir}" \
-            --define "_rpmdir       %{_topdir}" \
-            --define "_srcrpmdir    %{_topdir}" \
-            --define "_rpmfilename  $(VIRTP2V_RPM)" \
-            --define "_specdir      %{_topdir}" \
+            --define "_builddir     %{_topdir}/BUILD" \
+            --define "_rpmdir       %{_topdir}/RPMS" \
+            --define "_srcrpmdir    %{_topdir}/SRPMS" \
+            --define "_specdir      %{_topdir}/SPECS" \
             --define "_sourcedir    %(pwd)"
 
-rpmbuild/$(VIRTP2V_RPM): \
+p2vrepo/$(VIRTP2V_RPM): \
                virt-p2v.spec \
                virt-p2v virt-p2v-update-wrapper iso-attach \
                inittab
-       mkdir -p rpmbuild
+       $(MAKE) dist
+       rm -rf rpmbuild
+       mkdir rpmbuild rpmbuild/{RPMS,BUILD,SRPMS,SPECS} rpmbuild/RPMS/noarch
        rpmbuild $(RPM_FLAGS) -ba $<
-       createrepo rpmbuild
+       mkdir -p p2vrepo
+       cp rpmbuild/RPMS/noarch/$(VIRTP2V_RPM) p2vrepo
+       createrepo p2vrepo
 
 # Make the final script.
 

diff --git a/p2v.ks.in b/p2v.ks.in
index ae385d1..940b1f9 100644 (file)
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -32,10 +32,10 @@ repo --name=released --baseurl=@CD_BASE_URL@
 # A local repository if selected by ./configure --enable-localrepo=...
 @LOCALREPO@
 
-# The rpmbuild subdirectory, containing virt-p2v RPM.
-repo --name=p2v --baseurl=file://@abs_top_builddir@/rpmbuild
+# The p2vrepo subdirectory, containing virt-p2v RPM.
+repo --name=p2v --baseurl=file://@abs_top_builddir@/p2vrepo
 
-%packages
+%packages --excludedocs
 bash
 kernel
 syslinux
@@ -150,7 +150,7 @@ mkdir /mnt/root
 
 # Remove some unused files.
 rm -rf /usr/share/man          ;# 20 MB
-rm -rf /usr/share/doc          ;# 44 MB
-rm -rf /usr/share/locale       ;# 60 MB
+#rm -rf /usr/share/doc         ;# 44 MB
+#rm -rf /usr/share/locale      ;# 60 MB
 
 %end

diff --git a/virt-p2v.spec.in b/virt-p2v.spec.in
index dab5f58..a4a6f1a 100644 (file)
--- a/virt-p2v.spec.in
+++ b/virt-p2v.spec.in
@@ -1,7 +1,8 @@
+%define debug_package %{nil}
+
 Name:           @PACKAGE_NAME@
 Version:        @PACKAGE_VERSION@
-# Please keep the release as '1' for compatibility
-# with the Makefile.
+# Please keep the release as '1' for compatibility with the Makefile.
 Release:        1
 Summary:        Virt-p2v
 
@@ -10,12 +11,9 @@ License:        GPLv2+
 URL:            http://et.redhat.com/~rjones/virt-p2v
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#ExclusiveArch:  noarch
+BuildArch:      noarch
 
-Source0:        virt-p2v
-Source1:        virt-p2v-update-wrapper
-Source2:        iso-attach
-Source3:        inittab
+Source0:        %{name}-%{version}.tar.gz
 
 Requires:       ocaml >= 3.10.0
 Requires:       ocaml-runtime
@@ -40,17 +38,24 @@ P2V, V2V and V2P virtual machine migration.
 
 
 %prep
+%setup -q
 
 
 %build
+%configure
+make virt-p2v
+make -C po
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 0755 %{SOURCE0} %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
+install -m 0755 virt-p2v virt-p2v-update-wrapper iso-attach \
+  $RPM_BUILD_ROOT%{_bindir}
+install -m 0644 inittab $RPM_BUILD_ROOT%{_sysconfdir}
+make -C po install PODIR=$RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %clean
@@ -61,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_sysconfdir}/*
+%{_datadir}/locale/*
 
 
 %changelog