[mingw32-matahari/f15: 8/8] Merge branch 'master' into f15
Adam Stokes
astokes at fedoraproject.org
Fri Oct 21 16:32:16 UTC 2011
commit 1747327628473a0702e8a5151a3c176b6cf751ff
Merge: 74053df 270d765
Author: Adam Stokes <astokes at fedoraproject.org>
Date: Fri Oct 21 12:32:03 2011 -0400
Merge branch 'master' into f15
Conflicts:
mingw32-matahari.spec
.gitignore | 5 ++++
mingw32-matahari.spec | 62 +++++++++++++++++++++++++++++-------------------
sources | 1 +
3 files changed, 43 insertions(+), 25 deletions(-)
---
diff --cc mingw32-matahari.spec
index 41a73a0,375f931..b0379d1
--- a/mingw32-matahari.spec
+++ b/mingw32-matahari.spec
@@@ -44,10 -47,10 +47,8 @@@ as a set of objects with properties an
MinGW cross-compiled Windows application.
- %{_mingw32_debug_package}
-
-#{_mingw32_debug_package}
-
%prep
- %setup -q -n matahari-matahari-%{upstream_version}
+ %setup -q -n matahari-%{version}
%build
PATH=%{_mingw32_bindir}:$PATH
More information about the scm-commits
mailing list