From 1bd47d986cc2332730af279f29d1f21ff736a9bfbf31a6edd541988959dd6432 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Fri, 22 May 2020 12:18:29 +0000 Subject: [PATCH] revert, breaks provides on mono packages, and so rebuildpacs go crazy OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=126 --- mono-core.changes | 6 ------ mono-core.spec | 12 ------------ mono.attr | 3 --- 3 files changed, 21 deletions(-) delete mode 100644 mono.attr diff --git a/mono-core.changes b/mono-core.changes index 275f25f..8ad51c3 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 ca76a29..ca44d7b 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -51,7 +51,6 @@ 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 @@ -278,12 +277,6 @@ 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 @@ -1300,11 +1293,6 @@ 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 diff --git a/mono.attr b/mono.attr deleted file mode 100644 index 6ef5541..0000000 --- a/mono.attr +++ /dev/null @@ -1,3 +0,0 @@ -%__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