Remove the specfile from the tarball. Include contrib/ dir.

diff --git a/Makefile.am b/Makefile.am
index 80ea875..592ed94 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,6 @@ EXTRA_DIST = \
        make-initramfs.sh update-initramfs.sh \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
        guestfish.pod guestfish-actions.pod \
        make-initramfs.sh update-initramfs.sh \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
        guestfish.pod guestfish-actions.pod \

-       libguestfs.spec \

        html/pod.css \
        HACKING TODO \
        tests.c \
        html/pod.css \
        HACKING TODO \
        tests.c \


@@ -58,7 +57,13 @@ EXTRA_DIST = \
        recipes/*.example \
        html/recipes.css \
        make-recipes.sh \
        recipes/*.example \
        html/recipes.css \
        make-recipes.sh \

-       test-cleanup.sh
+       test-cleanup.sh \
+       contrib/README \
+       contrib/centos5.3-libguestfs.spec \
+       contrib/fedora-libguestfs.spec \
+       contrib/febootstrap/install.title \
+       contrib/febootstrap/install.html \
+       contrib/febootstrap/install.sh

 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in


@@ -87,7 +92,8 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 make-initramfs.sh: make-initramfs.sh.in
        ./config.status $@
 
 make-initramfs.sh: make-initramfs.sh.in
        ./config.status $@
 

-# Tests.  These are auto-generated from the test descriptions.
+# Tests.  These are auto-generated from the test descriptions
+# in the generator.

 
 check_PROGRAMS = tests
 
 
 check_PROGRAMS = tests
 

diff --git a/configure.ac b/configure.ac
index 575ab83..f04bafb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile examples/Makefile
                 haskell/Makefile
                 inspector/Makefile
                 make-initramfs.sh update-initramfs.sh
                 haskell/Makefile
                 inspector/Makefile
                 make-initramfs.sh update-initramfs.sh

-                libguestfs.spec libguestfs.pc
+                libguestfs.pc

                 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
                 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 

diff --git a/libguestfs.spec.in b/contrib/fedora-libguestfs.spec
similarity index 98%
rename from libguestfs.spec.in
rename to contrib/fedora-libguestfs.spec
index 4847910..b7d66ba 100644 (file)
--- a/libguestfs.spec.in
+++ b/contrib/fedora-libguestfs.spec
@@ -1,11 +1,11 @@
-# @configure_input@
+# libguestfs.spec.  Generated from libguestfs.spec.in by configure.

 
 # Enable to build w/o network.
 %global buildnonet 0
 
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 
 # Enable to build w/o network.
 %global buildnonet 0
 
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs

-Version:     @VERSION@
+Version:     1.0.23

 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries


@@ -430,8 +430,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
 
 
 %changelog

-* Fri May  8 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
-- New upstream version @VERSION@.
+* Fri May  8 2009 Richard Jones <rjones@redhat.com> - 1.0.23-1
+- New upstream version 1.0.23.

 
 * Fri May  8 2009 Richard Jones <rjones@redhat.com> - 1.0.21-2
 - New upstream version 1.0.21.
 
 * Fri May  8 2009 Richard Jones <rjones@redhat.com> - 1.0.21-2
 - New upstream version 1.0.21.