[fedora-easy-karma/el5: 10/10] Merge branch 'master' into el6
Till Maas
till at fedoraproject.org
Sun Aug 31 15:23:34 UTC 2014
commit 1c7bc34fecd6b79c2011a07a4dd0a2a204f78204
Merge: 1b51011 c6fa9cc
Author: Till Maas <opensource at till.name>
Date: Sun Aug 31 17:22:22 2014 +0200
Merge branch 'master' into el6
Conflicts:
fedora-easy-karma.spec
.gitignore | 4 ++++
fedora-easy-karma.spec | 33 ++++++++++++++++++++++++++++++---
sources | 2 +-
3 files changed, 35 insertions(+), 4 deletions(-)
---
diff --cc fedora-easy-karma.spec
index e3910ce,42994a6..ce91aca
--- a/fedora-easy-karma.spec
+++ b/fedora-easy-karma.spec
@@@ -13,10 -13,7 +13,10 @@@ URL: https://fedoraproject.o
# Updated using:
# http://fedorapeople.org/gitweb?p=walters/public_git/fedpkg-make-pull.git;a=summary
# Commandline: fedpkg-vcs -f pull-retarget
- Source0: fedora-easy-karma-0gitb0706146.tar.bz2
+ Source0: fedora-easy-karma-0git1ae921a8.tar.bz2
+# 2010-07-02: set the default product to EL- on EPEL. This might be autodected
+# some time in the far far aways future. Not suitable for upstreaming.
+Patch0: fedora-easy-karma-0-default-product.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@@ -32,8 -29,7 +32,8 @@@ updates that you have currently install
%prep
- %setup -q -n fedora-easy-karma-0gitb0706146
+ %setup -q -n fedora-easy-karma-0git1ae921a8
+%patch0 -p1 -b .default-product
%build
More information about the scm-commits
mailing list