pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 78976 from Base:System

Browse Source 
- workaround in mono-find-requires: use >= as operator when finding
  .NET 1.0 dependencies, the .NET 1.5 libraries are compatible
  (note mono-find-requires and mono-find-provides as used by the
   internal dependency generator are really outdated) (forwarded request 78828 from oertel)

OBS-URL: https://build.opensuse.org/request/show/78976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=154
This commit is contained in:
Sascha Peilicke 2011-08-16 07:48:59 +00:00 committed by Git OBS Bridge
commit cb410be412
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mono-find-requires.diff Normal file
View File

@ -0,0 +1,17 @@
--- scripts/mono-find-requires
+++ scripts/mono-find-requires
@@ -42,8 +42,12 @@
(START==1) && /^\tName=/ {
sub(/Name=/, "", $1);
LIBNAME=$1
-
- print "mono(" LIBNAME ") = " VERSION
+ # Allow rpm deps to be resolved for 1.0 profile version
+ if (VERSION=="1.0.3300.0")
+ OP=">="
+ else
+ OP="="
+ print "mono(" LIBNAME ") " OP " " VERSION
START=0
}
') 2> /dev/null

14
rpm.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Aug 15 01:04:17 CEST 2011 - ro@suse.de
- workaround in mono-find-requires: use >= as operator when finding
.NET 1.0 dependencies, the .NET 1.5 libraries are compatible
(note mono-find-requires and mono-find-provides as used by the
internal dependency generator are really outdated)
-------------------------------------------------------------------
Wed Aug 10 02:40:22 UTC 2011 - crrodriguez@opensuse.org
- Do not use -fno-strict-aliasing globally, the code
already does in places where really needed.
-------------------------------------------------------------------
Tue Jul 26 19:09:31 CEST 2011 - mls@suse.de

5
rpm.spec
View File

@ -113,6 +113,7 @@ Patch75: assumeexec.diff
Patch76: buildpipe.diff
Patch77: trailslash.diff
Patch78: docdefattr.diff
Patch79: mono-find-requires.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@ -175,7 +176,7 @@ rm -f rpmdb/db.h
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov
@ -190,7 +191,7 @@ rm -f m4/libtool.m4
rm -f m4/lt*.m4
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -ffunction-sections"
export CFLAGS="$RPM_OPT_FLAGS -ffunction-sections"
export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
%ifarch alpha
export CFLAGS="-g -O0 -fno-strict-aliasing"