From 986710a1222d4fa96029138b7cad71589a7302d6b34e814c5eec1450459ec38a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 27 Jul 2011 07:26:44 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/rpm revision 153.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=b8ced4b8b737d4762b5c3e683ea3dec5 --- rpm-python.spec | 2 +- rpm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 3aa21c5..46db13b 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -26,7 +26,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.1 -Release: 2 +Release: 3 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.spec b/rpm.spec index acc8722..2f521e8 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.1 -Release: 21 +Release: 23 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 From f228fb099096f17da4e6aabd872f246507437c875f561e0511f03ab8680ddd0a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 10 Aug 2011 20:05:06 +0000 Subject: [PATCH 2/3] Accepting request 78411 from home:elvigia:branches:Base:System - Do not use -fno-strict-aliasing globally, the code already does in places where really needed. OBS-URL: https://build.opensuse.org/request/show/78411 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=139 --- rpm.changes | 6 ++++++ rpm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpm.changes b/rpm.changes index 8708bf3..b1c46fb 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/rpm.spec b/rpm.spec index 2f521e8..722f94d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -190,7 +190,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" From dd2aa6fb9568c2882077d33ff919cc8f38b2950f15285c904dbee2db2f56472f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 15 Aug 2011 19:21:00 +0000 Subject: [PATCH 3/3] Accepting request 78828 from home:oertel:branches:openSUSE:Factory - 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) OBS-URL: https://build.opensuse.org/request/show/78828 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=140 --- mono-find-requires.diff | 17 +++++++++++++++++ rpm.changes | 8 ++++++++ rpm.spec | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 mono-find-requires.diff diff --git a/mono-find-requires.diff b/mono-find-requires.diff new file mode 100644 index 0000000..b75fe06 --- /dev/null +++ b/mono-find-requires.diff @@ -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 diff --git a/rpm.changes b/rpm.changes index b1c46fb..9ca12a2 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/rpm.spec b/rpm.spec index 722f94d..ecb37fa 100644 --- a/rpm.spec +++ b/rpm.spec @@ -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