summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-02-17 19:42:55 -0600
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-02-17 19:42:55 -0600
commitcf3ef263fc45e2293002f0c3147ae87927cc73de (patch)
tree5e6f1b2ccac6d44e15e447bb240d61420939c931
parent7f63e5f253a78e5939369316fb8ef7951cd044a5 (diff)
downloadcygwin-filesystem-cf3ef263fc45e2293002f0c3147ae87927cc73de.tar.gz
cygwin-filesystem-cf3ef263fc45e2293002f0c3147ae87927cc73de.tar.xz
cygwin-filesystem-cf3ef263fc45e2293002f0c3147ae87927cc73de.zip
Add redhat-rpm-config dep
Unlike the stock rpm brp-strip-static-archive, this version accepts $STRIP.
-rw-r--r--cygwin-filesystem.spec10
-rw-r--r--macros.cygwin6
2 files changed, 8 insertions, 8 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec
index 46a8ca5..7679ee8 100644
--- a/cygwin-filesystem.spec
+++ b/cygwin-filesystem.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: cygwin-filesystem
-Version: 1
+Version: 2
Release: 1%{?dist}
Summary: Cygwin base filesystem and environment
@@ -23,6 +23,8 @@ Source8: Toolchain-cygwin.cmake
Source9: cygwin-find-debuginfo.sh
Requires: pkgconfig
+# for brp-strip-static-archive which respects $STRIP
+Requires: redhat-rpm-config
# Note about 'Provides: cygwin(foo.dll)'
# ------------------------------------------------------------
@@ -156,5 +158,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Feb 16 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1-1
+* Thu Feb 17 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2-1
+- Added dependency on redhat-rpm-config for brp-strip-static-archive which
+ respects $STRIP.
+
+* Wed Feb 16 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1-1
- Initial RPM release, largely based on mingw32-filesystem.
diff --git a/macros.cygwin b/macros.cygwin
index 08fc68d..f2fd7e4 100644
--- a/macros.cygwin
+++ b/macros.cygwin
@@ -58,12 +58,6 @@
/usr/lib/rpm/cygwin-find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
-# skip brp-strip-static-archive and brp-strip-comment-note
-%_cygwin_os_install_post \
- %{_rpmconfigdir}/brp-compress \
- %{_rpmconfigdir}/brp-strip \
-%{nil}
-
# Template for debug sub-package.
%_cygwin_debug_package(n:) \