dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 11:17:39 +00:00 · 2009-11-26 01:23:48 +00:00 · 2009-01-16 15:44:26 +00:00 · 2009-01-16 15:38:23 +00:00 · 2008-11-07 04:37:01 +00:00
6 changed files with 28 additions and 28 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-btrfs-progs-0.15.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+btrfs-progs-0.17.tar.bz2
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: btrfs-progs
-# $Id$
-NAME := btrfs-progs
-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)
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@ -1,6 +1,6 @@
 Name:           btrfs-progs
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.17
+Release:        5%{?dist}
 Summary:        Userspace programs for btrfs

 Group:          System Environment/Base
@ -9,7 +9,7 @@ URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-BuildRequires:  e2fsprogs-devel
+BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel

 %define _root_sbindir /sbin

@ -22,6 +22,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.

 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} convert

 %install
 rm -rf $RPM_BUILD_ROOT
@ -36,11 +37,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_root_sbindir}/btrfsctl
 %{_root_sbindir}/btrfsck
 %{_root_sbindir}/mkfs.btrfs
-%{_root_sbindir}/debug-tree
+%{_root_sbindir}/btrfs-debug-tree
+%{_root_sbindir}/btrfs-image
 %{_root_sbindir}/btrfs-show
 %{_root_sbindir}/btrfs-vol
+%{_root_sbindir}/btrfs-convert
+%{_root_sbindir}/btrfstune

 %changelog
+* Fri Jan 16 2009 Josef Bacik <josef@toxicpanda.com> 0.17-5
+* fix the sources for F10
+
+* Fri Jan 16 2009 Marek Mahut <mmahut@fedoraproject.org> 0.17-4
+- RHBZ#480219 btrfs-convert is missing
+
+* Mon Jan 12 2009 Josef Bacik <josef@toxicpanda.com> 0.17-2
+- fixed wrong sources upload
+
+* Mon Jan 12 2009 Josef Bacik <josef@toxicpanda.com> 0.17
+- Upstream release 0.17
+
+* Sat Jan 10 2009 Kyle McMartin <kyle@redhat.com> 0.16.git1-1
+- Upstream git sync from -g72359e8 (needed for kernel...)
+
+* Sat Jan 10 2009 Marek Mahut <mmahut@fedoraproject.org> 0.16-1
+- Upstream release 0.16
+
 * Mon Jun 25 2008 Josef Bacik <josef@toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS

--- a/import.log
+++ b/import.log
@ -1 +0,0 @@
-btrfs-progs-0_15-4_fc8:HEAD:btrfs-progs-0.15-4.fc8.src.rpm:1214853686
--- a/2
+++ b/2
@ -1 +1 @@
-fabd80e8a9ea2d035491815ebefb6930  btrfs-progs-0.15.tar.bz2
+88d1fde8ecf237fc210510911ba06786  btrfs-progs-0.17.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	f632e340b5	dist-git conversion	2010-07-28 11:17:39 +00:00
Bill Nottingham	49e77ddfc3	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:23:48 +00:00
Josef Bacik	47f058eac0	rrr, i didn't update the sources in F-10.	2009-01-16 15:44:26 +00:00
Josef Bacik	0a17edf321	update to upstream and turn on the conver stuff	2009-01-16 15:38:23 +00:00
Jesse Keating	15c4e081cc	Initialize branch F-10 for btrfs-progs	2008-11-07 04:37:01 +00:00
				`@ -1 +0,0 @@`
				`btrfs-progs-0_15-4_fc8:HEAD:btrfs-progs-0.15-4.fc8.src.rpm:1214853686`