[fedora-easy-karma/el5: 2/2] Merge branch 'master' into el6
Till Maas
till at fedoraproject.org
Fri Sep 5 05:28:57 UTC 2014
commit dbe29f67fa85d680e08288ac7689b7e9bf10f80f
Merge: 1c7bc34 b3c7bc2
Author: Till Maas <opensource at till.name>
Date: Fri Sep 5 07:27:56 2014 +0200
Merge branch 'master' into el6
Conflicts:
fedora-easy-karma.spec
.gitignore | 1 +
fedora-easy-karma.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc fedora-easy-karma.spec
index ce91aca,7ff7481..94e0731
--- 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-0git1ae921a8.tar.bz2
+ Source0: fedora-easy-karma-0git5fb5b77a.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-0git1ae921a8
+ %setup -q -n fedora-easy-karma-0git5fb5b77a
+%patch0 -p1 -b .default-product
%build
More information about the scm-commits
mailing list