[lpf/f20] Adding bugfix patch.
leamas
leamas at fedoraproject.org
Thu Jan 23 20:45:27 UTC 2014
commit 1c5728e7a12ccb5fe70fcf70bb8faeba8e98519a
Author: Alec Leamas <leamas.alec at gmail.com>
Date: Thu Jan 23 21:08:41 2014 +0100
Adding bugfix patch.
0001-README-Add-a-note-on-dependencies-22.patch | 26 +++++++++++++++++++
0002-lpf-Bugfix.patch | 30 +++++++++++++++++++++++
lpf.spec | 13 +++++++++-
3 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/0001-README-Add-a-note-on-dependencies-22.patch b/0001-README-Add-a-note-on-dependencies-22.patch
new file mode 100644
index 0000000..fd19e50
--- /dev/null
+++ b/0001-README-Add-a-note-on-dependencies-22.patch
@@ -0,0 +1,26 @@
+From 18d9e23c8dbdcc6fa9c4fdf7eb16ebc5e2b7ea6b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Fri, 17 Jan 2014 21:25:09 +0100
+Subject: [PATCH 1/2] README: Add a note on dependencies (#22).
+
+---
+ README.md | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/README.md b/README.md
+index c749158..1e4cdfe 100644
+--- a/README.md
++++ b/README.md
+@@ -27,6 +27,9 @@ First clone the sources, create a fresh rpm and install it:
+ $ tools/make_rpm
+ $ sudo rpm -U --force dist/lpf-*.noarch.rpm
+
++Install the required dependencies: look into lpf.spec and install all
++packages mentioned as Requires: or BuildRequires:
++
+ Then install your first lpf bootstrap package:
+
+ $ cd examples/msttcore-fonts
+--
+1.8.4.2
+
diff --git a/0002-lpf-Bugfix.patch b/0002-lpf-Bugfix.patch
new file mode 100644
index 0000000..b62436c
--- /dev/null
+++ b/0002-lpf-Bugfix.patch
@@ -0,0 +1,30 @@
+From 358a885cd3771d3e1bbb15b4e2b5650e153af04d Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Thu, 23 Jan 2014 21:02:52 +0100
+Subject: [PATCH 2/2] lpf: Bugfix.
+
+---
+ scripts/lpf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/lpf b/scripts/lpf
+index dfd03cf..e6140c3 100755
+--- a/scripts/lpf
++++ b/scripts/lpf
+@@ -107,11 +107,11 @@ function rebuild_package()
+ local pkg=$1
+
+ case $( get_state $pkg ) in
+- 'failed') $scriptdir/lpf-packbuild 'set-state' $pkg 'build-wait'
++ 'failed') $scriptdir/lpf-pkgbuild 'set-state' $pkg 'build-wait'
+ $scriptdir/lpf-pkgbuild 'build' $pkg
+ ;;
+ 'not-approved')
+- $scriptdir/lpf-packbuild 'set-state' $pkg 'approve-wait'
++ $scriptdir/lpf-pkgbuild 'set-state' $pkg 'approve-wait'
+ lpf-approve $pkg && $scriptdir/lpf-pkgbuild 'build' $pkg
+ ;;
+ *) error "Rebuild error" "Illegal state (aborting)" >&2
+--
+1.8.4.2
+
diff --git a/lpf.spec b/lpf.spec
index 9e0dad9..9c21fd3 100644
--- a/lpf.spec
+++ b/lpf.spec
@@ -3,7 +3,7 @@
Name: lpf
Version: 0.1
-Release: 3.%{shortcommit}%{?dist}
+Release: 5.%{shortcommit}%{?dist}
Summary: Local package factory - build non-redistributable rpms
# Icon from iconarchive.com
@@ -28,6 +28,9 @@ Requires: yum-utils
Requires: zenity
Requires(pre): shadow-utils
+Patch1: 0001-README-Add-a-note-on-dependencies-22.patch
+Patch2: 0002-lpf-Bugfix.patch
+
%description
lpf (Local Package Factory) is designed to handle two separate
@@ -42,6 +45,8 @@ Besides being interactive the operation is similar to akmod and dkms.
%prep
%setup -qn lpf-%{commit}
+%patch1 -p1
+%patch2 -p1
rm -rf examples
@@ -99,6 +104,12 @@ fi
%changelog
+* Thu Jan 23 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-5.36e5aa0
+- Adding two patches, doc update + bugfix in lpf script.
+
+* Fri Jan 17 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-4.36e5aa0
+- rebuilt
+
* Wed Jan 08 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-3.36e5aa0
- Remove bad requirement, reinstall %check, confirm fedkpg bug fixed.
More information about the scm-commits
mailing list