[mingw-filesystem] Merge copy-n-paste duplicate %mingw32_debug_package code
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 18:19:18 UTC 2012
commit f5e6db3480a60aa501541ae74092f600ccd2fac5
Author: Kalev Lember <kalevlember at gmail.com>
Date: Tue Mar 6 19:58:43 2012 +0200
Merge copy-n-paste duplicate %mingw32_debug_package code
macros.mingw32 | 14 +-------------
mingw-filesystem.spec | 5 ++++-
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index 1af0cb8..9938813 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -236,6 +236,7 @@ package or when debugging this package. \
%_mingw32_make %{mingw32_make}
%_mingw32_cmake %{mingw32_cmake}
%_mingw32_description %{mingw32_description}
+%_mingw32_debug_package %{mingw32_debug_package}
# The old implementation of the _mingw32_debug_package macro isn't
# forward-compatible with the new implementation using mingw_debug_package
@@ -244,19 +245,6 @@ package or when debugging this package. \
%{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} old\
%{nil}
-%_mingw32_debug_package(n:) \
-%define __mingw32_debug_pkg_name %{-n*}%{!-n:%{_mingw32_pkg_name}}-debuginfo \
-%package -n %{__mingw32_debug_pkg_name} \
-Summary: Debug information for package %{name} \
-Group: Development/Debug \
-%description -n %{__mingw32_debug_pkg_name} \
-This package provides debug information for package %{_mingw32_pkg_name}.\
-Debug information is useful when developing applications that use this\
-package or when debugging this package.\
-%files -n %{__mingw32_debug_pkg_name} -f debugfiles.list\
-%defattr(-,root,root,-)\
-%{nil}
-
# This macro has been dropped from the new guidelines, keep
# it here around for backwards compatibility
%_mingw32_makeinstall %{mingw32_env} ; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 2e68f04..3c02327 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw-filesystem
Version: 95
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -244,6 +244,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog
+* Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 95-3
+- Merge copy-n-paste duplicate %%mingw32_debug_package code
+
* Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-2
- Fixed broken summary tags
More information about the scm-commits
mailing list