[mingw32-filesystem/f14] Make sure the -debuginfo subpackages are mingw32- prefixed
by Kalev Lember
commit 48c863550e12cb7fb71e3afcb7cdc852c8716e99
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Tue May 24 10:54:33 2011 +0300
Make sure the -debuginfo subpackages are mingw32- prefixed
... even if the base package is mingw-. Latest Fedora MinGW packaging
guidelines allow the base (source) package be named mingw-, but all
binary packages should be mingw32-.
http://lists.fedoraproject.org/pipermail/mingw/2011-May/003708.html
macros.mingw32 | 11 +++++++----
mingw32-filesystem.spec | 6 +++++-
2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index aa75be7..e65767f 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -1,5 +1,7 @@
# RPM macros for Fedora MinGW.
+%_mingw32_pkg_name %(echo %{name} | sed 's/^mingw-/mingw32-/')
+
%_mingw32_target i686-pc-mingw32
# Paths.
@@ -60,14 +62,15 @@
# Template for debug sub-package.
%_mingw32_debug_package(n:) \
-%package %{-n:-n %{-n*}-}debuginfo \
+%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:-n %{-n*}-}debuginfo \
-This package provides debug information for package %{name}.\
+%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 debuginfo -f debugfiles.list\
+%files -n %{__mingw32_debug_pkg_name} -f debugfiles.list\
%defattr(-,root,root,-)\
%{nil}
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 4fe0847..537ba73 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 64
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -167,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 29 2011 Kalev Lember <kalev(a)smartlink.ee> - 64-2
+- Make sure the -debuginfo subpackages are mingw32- prefixed
+ even if the base package is mingw-
+
* Sun Nov 14 2010 Ivan Romanov <drizt(a)land.ru> 64-1
- Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0)
- Using win32-g++-fedora-cross instead fedora-win32-cross spec file
12 years, 11 months
[mingw32-filesystem/f15] (9 commits) ...Make sure the -debuginfo subpackages are mingw32- prefixed
by Kalev Lember
Summary of changes:
b4298c0... Support RPM 4.9 new "fileattr" dep extraction system (*)
11c4c8f... Cleaned up the spec file from cruft not needed with latest (*)
2de8bb6... Generate versionless mingw32-filesystem Requires (*)
750c540... Own the _mingw32_datadir/cmake/ directory (*)
e9ebc71... Own etc/, share/pkgconfig/, share/xml/ directories (*)
9781763... Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datad (*)
15eccff... Own the sbin/ directory (*)
82ecebc... Fixed the -n option with _mingw32_debug_package macro (*)
7476133... Make sure the -debuginfo subpackages are mingw32- prefixed (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 11 months
[mingw32-filesystem] Make sure the -debuginfo subpackages are mingw32- prefixed
by Kalev Lember
commit 74761330f7a14298bf52731aad9d40f70f1682b0
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Sun May 29 17:17:44 2011 +0300
Make sure the -debuginfo subpackages are mingw32- prefixed
... even if the base package is mingw-. Latest Fedora MinGW packaging
guidelines allow the base (source) package be named mingw-, but all
binary packages should be mingw32-.
http://lists.fedoraproject.org/pipermail/mingw/2011-May/003708.html
macros.mingw32 | 11 +++++++----
mingw32-filesystem.spec | 6 +++++-
2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index 8bc6bbe..19ce4b8 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -1,5 +1,7 @@
# RPM macros for Fedora MinGW.
+%_mingw32_pkg_name %(echo %{name} | sed 's/^mingw-/mingw32-/')
+
%_mingw32_target i686-pc-mingw32
# Paths.
@@ -60,14 +62,15 @@
# Template for debug sub-package.
%_mingw32_debug_package(n:) \
-%package %{-n:-n %{-n*}-}debuginfo \
+%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:-n %{-n*}-}debuginfo \
-This package provides debug information for package %{name}.\
+%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:-n %{-n*}-}debuginfo -f debugfiles.list\
+%files -n %{__mingw32_debug_pkg_name} -f debugfiles.list\
%defattr(-,root,root,-)\
%{nil}
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index c33cf14..3b711eb 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 69
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -170,6 +170,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
+* Sun May 29 2011 Kalev Lember <kalev(a)smartlink.ee> - 69-2
+- Make sure the -debuginfo subpackages are mingw32- prefixed
+ even if the base package is mingw-
+
* Tue May 24 2011 Kalev Lember <kalev(a)smartlink.ee> - 69-1
- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
- Own the sbin/ directory
12 years, 11 months
[mingw32-filesystem] Fixed the -n option with _mingw32_debug_package macro
by Kalev Lember
commit 82ecebcd825286860b073a6a35e10bee1c092ea6
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Tue May 24 10:54:33 2011 +0300
Fixed the -n option with _mingw32_debug_package macro
The -n option was passed down to -debuginfo subpackage's %package and
%description sections, but not to %files. This change fixes %files to
work the %same way as %package and %description.
Not sure yet if the -n option will get any use, but at least this fixes
an obvious oversight.
https://bugzilla.redhat.com/show_bug.cgi?id=700815#c12
macros.mingw32 | 2 +-
mingw32-filesystem.spec | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index c89cd7e..8bc6bbe 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -67,7 +67,7 @@ Group: Development/Debug \
This package provides debug information for package %{name}.\
Debug information is useful when developing applications that use this\
package or when debugging this package.\
-%files debuginfo -f debugfiles.list\
+%files %{-n:-n %{-n*}-}debuginfo -f debugfiles.list\
%defattr(-,root,root,-)\
%{nil}
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index d6f205b..c33cf14 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -173,6 +173,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
* Tue May 24 2011 Kalev Lember <kalev(a)smartlink.ee> - 69-1
- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
- Own the sbin/ directory
+- Fixed the -n option with _mingw32_debug_package macro
* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-3
- Own etc/, share/pkgconfig/, share/xml/ directories
12 years, 11 months
[mingw32-filesystem] Own the sbin/ directory
by Kalev Lember
commit 15eccffbcb3c3e3603679f944b939ab1dbeff5e4
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Tue May 24 10:53:48 2011 +0300
Own the sbin/ directory
mingw32-filesystem.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 3f705ec..d6f205b 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -114,6 +114,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/sys
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/sbin
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/cmake
@@ -171,6 +172,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
* Tue May 24 2011 Kalev Lember <kalev(a)smartlink.ee> - 69-1
- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
+- Own the sbin/ directory
* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-3
- Own etc/, share/pkgconfig/, share/xml/ directories
12 years, 11 months