From b247b29d81d0d284665f14ec2c226579818c81a3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Mon, 10 Dec 2007 22:01:38 +0000
Subject: [PATCH 1/4] Initialize branch OLPC-2 for util-linux-ng

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..a62db9e
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+OLPC-2

From 92483e58f53bf52fb00d166a55dda3f6b219f05c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Tue, 11 Dec 2007 17:58:53 +0000
Subject: [PATCH 2/4] BuildRequires popt not popt-devel

---
 util-linux-ng.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util-linux-ng.spec b/util-linux-ng.spec
index 3918669..cac0639 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.13.1
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -33,7 +33,7 @@ BuildRequires: pam-devel
 BuildRequires: slang-devel
 BuildRequires: texinfo
 BuildRequires: zlib-devel
-BuildRequires: popt-devel
+BuildRequires: popt
 
 ### Sources
 #Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.tar.bz2
@@ -525,6 +525,9 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Tue Dec 11 2007 Dennis Gilmore <dennis@laptop.org> 2.13.1-0.2
+- BR popt  since popt-devel does not exist on F-7  which olpc is based on
+
 * Sun Dec  9 2007 Karel Zak <kzak@redhat.com> 2.13.1-0.1
 - update to the latest upstream stable branch
   (commit: fda9d11739ee88c3b2f22a73f12ec019bd3b8335)

From fb9e3b99b47a0d5e8ebc5614e5fad742f8a67396 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:16:36 +0000
Subject: [PATCH 3/4] 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 c0f296d..c5d5fa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: util-linux-ng
-# $Id$
+# $Id: Makefile,v 1.1 2007/08/17 21:07:02 wtogami Exp $
 NAME := util-linux-ng
 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 bda4dc30594c4cd8bc988e3f9813e6b3a679726d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:49:58 +0000
Subject: [PATCH 4/4] 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 c5d5fa9..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: util-linux-ng
-# $Id: Makefile,v 1.1 2007/08/17 21:07:02 wtogami Exp $
-NAME := util-linux-ng
-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 a62db9e..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-OLPC-2