#2 Use mono-provided RPM dependency generators
Opened a month ago by mavit. Modified a month ago
rpms/ mavit/mono provides  into  master

@@ -1,12 +0,0 @@ 

- --- a/scripts/mono-find-provides.in	2018-03-02 21:56:22.911149656 +0100

- +++ b/scripts/mono-find-provides.in	2018-03-02 21:56:57.985962849 +0100

- @@ -16,7 +16,8 @@

-  

-  # Only include files with /gac/, /Facades/ or /4.5/ in path

-  #  (Allows packages to contain private assemblies that don't conflict with other packages)

- -monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/(gac|Facades|4\\.5)/"))

- +#quite a number of files are not in the gac, eg. System.IO, and Mono.Configuration.Crypto, and others

- +#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/(gac|Facades|4\\.5)/"))

-  # Disabled... see ChangeLog

-  

-  # Set the prefix, unless it is overriden (used when building mono rpms)

file added
+3

@@ -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

file modified
+11 -3

@@ -23,7 +23,7 @@ 

  %global xamarinrelease 0

  Name:           mono

  Version:        5.18.1

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        Cross-platform, Open Source, .NET development framework

  

  License:        MIT

@@ -34,9 +34,9 @@ 

  # sn -k mono.snk

  # You should not regenerate this unless you have a really, really, really good reason.

  Source1:        mono.snk

+ Source2:        mono.attr

didn't you forgot to commit this file?

  Patch0:         mono-5.10.0-ignore-reference-assemblies.patch

  Patch1:         mono-4.2.1-ppc.patch

- Patch2:         mono-5.10.0-find-provides.patch

  Patch3:         mono-4.2-fix-winforms-trayicon.patch

  Patch4:         mono-4.6.1-aarch64.patch

  Patch5:         mono-5.18.1-s390x-ucontext.patch

@@ -147,6 +147,7 @@ 

  Requires:       mono-core = %{version}-%{release}

  Requires:       pkgconfig

  Requires:       glib2-devel

+ Conflicts:      rpm-build <= 4.14.2.1-7

this should be < …-8

  

  %description devel

  This package completes the Mono developer toolchain with the mono profiler,

@@ -325,7 +326,6 @@ 

  %ifarch ppc ppc64 ppc64le s390x

  %patch1 -p1

  %endif

- %patch2 -p1

  %patch3 -p1

  %patch4 -p1

  %patch5 -p1

@@ -447,6 +447,10 @@ 

  

  %find_lang mcs

  

+ # plumb in RPM dependency generators

+ install -m 0755 -d %{buildroot}%{_fileattrsdir}

+ install -m 0644 -p %{SOURCE2} %{buildroot}%{_fileattrsdir}/mono.attr

+ 

  %post

  %{?ldconfig}

  cert-sync /etc/pki/tls/certs/ca-bundle.crt

@@ -707,6 +711,7 @@ 

  %{_includedir}/mono-2.0/mono/metadata/*.h

  %{_includedir}/mono-2.0/mono/utils/*.h

  %{_includedir}/mono-2.0/mono/cil/opcode.def

+ %{_fileattrsdir}/mono.attr

  

  %files locale-extras

  %gac_dll I18N.CJK

@@ -879,6 +884,9 @@ 

  %files complete

  

  %changelog

+ * Tue Apr 23 2019 Peter Oliver <rpm@mavit.org.uk> - 5.18.1-3

+ - Use mono-provided RPM dependency generators.  Fixes #1700892, but requires https://github.com/rpm-software-management/rpm/pull/676.

+ 

  * Wed Mar 27 2019 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 5.18.1-2

  - disable bootstrapping

  

See also https://src.fedoraproject.org/rpms/rpm/pull-request/18, which removes /usr/lib/rpm/fileattrs/mono.attr from rpm-build so it can be provided by mono-devel without conflict.

this should be < …-8

didn't you forgot to commit this file?

1 new commit added

  • Remember to commit mono.attr.
a month ago

this should be < …-8

I'll leave this for now, since we won't know the exact version until the change is made to the RPM package, and will quite likely need to change it again anyway.

didn't you forgot to commit this file?

Oops. Added. Thanks.