diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 16:04:31 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 16:04:33 -0500 |
| commit | ee25a4327d01300b38cc584131c45829532066af (patch) | |
| tree | c9cf20d2e1f99c1d80cd8c6d4860355d92541433 | |
| parent | 0407cc494564fed4d18417332886cce6b41acafa (diff) | |
| download | cygwin-filesystem-ee25a4327d01300b38cc584131c45829532066af.tar.gz cygwin-filesystem-ee25a4327d01300b38cc584131c45829532066af.tar.xz cygwin-filesystem-ee25a4327d01300b38cc584131c45829532066af.zip | |
Place the RPM macros in /usr/lib/rpm/macros.d when using a modern RPM
Based on mingw-filesystem commit 7871a5f4f525ea215044154f84810e014428c5ce.
| -rw-r--r-- | cygwin-filesystem.spec | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index 83687e8..a70cce3 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -1,8 +1,13 @@ %global debug_package %{nil} +# Place RPM macros in %%{_rpmconfigdir}/macros.d if it exists (RPM 4.11+) +# Otherwise, use %%{_sysconfdir}/rpm +# https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + Name: cygwin-filesystem Version: 11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cygwin cross compiler base filesystem and environment Group: Development/Libraries @@ -128,10 +133,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cygwin -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cygwin32 -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cygwin64 +mkdir -p $RPM_BUILD_ROOT%{macrosdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/macros.cygwin +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{macrosdir}/macros.cygwin32 +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{macrosdir}/macros.cygwin64 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/ @@ -212,13 +217,13 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %doc COPYING %dir %{_sysconfdir}/rpmlint/ %config(noreplace) %{_sysconfdir}/rpmlint/cygwin-rpmlint.config -%{_sysconfdir}/rpm/macros.cygwin +%{macrosdir}/macros.cygwin %{_libexecdir}/cygwin-scripts %{_rpmconfigdir}/cygwin* %dir %{_datadir}/cygwin/ %files -n cygwin32-filesystem -%{_sysconfdir}/rpm/macros.cygwin32 +%{macrosdir}/macros.cygwin32 %config(noreplace) %{_sysconfdir}/profile.d/cygwin32.sh %{_bindir}/cygwin32-configure %{_bindir}/cygwin32-cmake @@ -229,7 +234,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %{_datadir}/cygwin/Toolchain-cygwin32.cmake %files -n cygwin64-filesystem -%{_sysconfdir}/rpm/macros.cygwin64 +%{macrosdir}/macros.cygwin64 %config(noreplace) %{_sysconfdir}/profile.d/cygwin64.sh %{_bindir}/cygwin64-configure %{_bindir}/cygwin64-cmake @@ -241,6 +246,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %changelog +* Wed Jun 10 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 11-3 +- Place the RPM macros in /usr/lib/rpm/macros.d when using a modern RPM + * Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 11-2 - Fix typo |