From 660d68f2854e11fa3c6f14b1947062c9651478a0 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sun, 18 Jan 2015 16:33:27 -0600 Subject: [PATCH] Add _monodir and _monogacdir from F21. --- redhat-rpm-config-9.1.0-mono.patch | 9 +++++++++ redhat-rpm-config.spec | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 redhat-rpm-config-9.1.0-mono.patch diff --git a/redhat-rpm-config-9.1.0-mono.patch b/redhat-rpm-config-9.1.0-mono.patch new file mode 100644 index 0000000..af24781 --- /dev/null +++ b/redhat-rpm-config-9.1.0-mono.patch @@ -0,0 +1,9 @@ +diff -up redhat-rpm-config-9.1.0/macros.mono-srpm.orig redhat-rpm-config-9.1.0/macros.mono-srpm +--- redhat-rpm-config-9.1.0/macros.mono-srpm.orig 2015-01-18 15:55:51.009472124 -0600 ++++ redhat-rpm-config-9.1.0/macros.mono-srpm 2015-01-18 15:57:11.646951234 -0600 +@@ -1,2 +1,5 @@ + # arches that mono builds on + %mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ++ ++%_monodir %{_prefix}/lib/mono ++%_monogacdir %{_monodir}/gac diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 8ad8fa7..87f2086 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 54%{?dist} +Release: 55%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -69,6 +69,7 @@ Patch25: redhat-rpm-config-9.1.0-libtool-hardened-build.patch # https://bugzilla.redhat.com/show_bug.cgi?id=986871 Patch26: redhat-rpm-config-9.1.0-unversioned-docdirs.patch %endif +Patch27: redhat-rpm-config-9.1.0-mono.patch BuildArch: noarch Requires: coreutils @@ -113,6 +114,7 @@ Red Hat specific rpm configuration files. %if 0%{?fedora} >= 20 %patch26 -p1 %endif +%patch27 -p1 %build @@ -134,6 +136,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Sun Jan 18 2015 Jason L Tibbitts III - 9.1.0-55 +- Add _monodir and _monogacdir from F21 so that we can have consistent + packaging guidelines across supported Fedora versions. + * Wed Sep 04 2013 Karsten Hopp 9.1.0-54 - update config.sub with ppc64p7 support (from Fedora automake)