From 3e264b8f69ffae8df2bc32bd34a496372b97eb4f585301864d02b4530233f531 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 1 May 2020 09:11:58 +0000 Subject: [PATCH 1/2] Accepting request 798897 from home:dimstar:Factory - Add mono.attr and install it to %_rpmconfigdir/fileattrs: enable the dependency scanner for rpm packages (boo#1152775). OBS-URL: https://build.opensuse.org/request/show/798897 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=207 --- mono-core.changes | 6 ++++++ mono-core.spec | 6 ++++++ mono.attr | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 mono.attr diff --git a/mono-core.changes b/mono-core.changes index 8ad51c3..275f25f 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 29 10:05:31 UTC 2020 - Dominique Leuenberger + +- Add mono.attr and install it to %_rpmconfigdir/fileattrs: enable + the dependency scanner for rpm packages (boo#1152775). + ------------------------------------------------------------------- Thu Mar 19 07:44:57 UTC 2020 - Guillaume GARDET diff --git a/mono-core.spec b/mono-core.spec index ca44d7b..5602557 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -51,6 +51,7 @@ Url: http://www.mono-project.com Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{version_suffix}.tar.xz Source1: mono-core.rpmlintrc Source2: gmcs +Source3: mono.attr # ppc build segfault so exclude it ExcludeArch: ppc # PATCH-FIX-OPENSUSE remove checks for libmono in mono-find-provides and mono-find-requires scripts @@ -277,6 +278,10 @@ make %install %make_install +# install the rpm file attributes to arm the dependency scanner +mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs +install %{SOURCE3} %{buildroot}%{_rpmconfigdir}/fileattrs/mono.attr + # Remove hardcoded lib directory from the config sed -i 's,\$mono_libdir/,,g' %{buildroot}%{_sysconfdir}/mono/config @@ -1293,6 +1298,7 @@ Mono development tools. %{_bindir}/mono-api-info %{_bindir}/mono-api-html %{_bindir}/mono-cil-strip +%{_rpmconfigdir}/fileattrs/mono.attr %{_bindir}/mono-find-provides %{_bindir}/mono-find-requires %{_bindir}/mono-heapviz diff --git a/mono.attr b/mono.attr new file mode 100644 index 0000000..6ef5541 --- /dev/null +++ b/mono.attr @@ -0,0 +1,3 @@ +%__mono_provides %{_bindir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_requires %{_bindir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_magic Mono/.Net assembly From af0d872e9ee21b2c48db3f4b2f704487f07e7b3820b35489fef5f053e643ab01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 15 May 2020 18:24:57 +0000 Subject: [PATCH 2/2] Accepting request 805762 from home:lemmy04:branches:Mono:Factory both Leap 15.1 and the upcoming Leap 15.2 still have that mono.attr file as part of rpm, so at least for those mono can't have the file. OBS-URL: https://build.opensuse.org/request/show/805762 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=208 --- mono-core.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mono-core.spec b/mono-core.spec index 5602557..ca76a29 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -278,9 +278,11 @@ make %install %make_install +%if 0%{?suse_version} > 1500 # install the rpm file attributes to arm the dependency scanner mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs install %{SOURCE3} %{buildroot}%{_rpmconfigdir}/fileattrs/mono.attr +%endif # Remove hardcoded lib directory from the config sed -i 's,\$mono_libdir/,,g' %{buildroot}%{_sysconfdir}/mono/config @@ -1298,7 +1300,11 @@ Mono development tools. %{_bindir}/mono-api-info %{_bindir}/mono-api-html %{_bindir}/mono-cil-strip + +%if 0%{?suse_version} > 1500 %{_rpmconfigdir}/fileattrs/mono.attr +%endif + %{_bindir}/mono-find-provides %{_bindir}/mono-find-requires %{_bindir}/mono-heapviz