Hello community,

here is the log from the commit of package rpm for openSUSE:Factory
checked in at Tue Aug 16 09:49:08 CEST 2011.



--------
--- rpm/rpm.changes     2011-07-26 19:10:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes        2011-08-15 
01:06:04.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Aug 15 01:04:17 CEST 2011 - [email protected]
+
+- 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 - [email protected]
+
+- Do not use -fno-strict-aliasing globally, the code 
+  already does in places where really needed.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  mono-find-requires.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.163i3n/_old  2011-08-16 09:20:15.000000000 +0200
+++ /var/tmp/diff_new_pack.163i3n/_new  2011-08-16 09:20:15.000000000 +0200
@@ -26,7 +26,7 @@
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.9.1
-Release:        3
+Release:        4
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec

++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.163i3n/_old  2011-08-16 09:20:15.000000000 +0200
+++ /var/tmp/diff_new_pack.163i3n/_new  2011-08-16 09:20:15.000000000 +0200
@@ -29,7 +29,7 @@
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.9.1
-Release:        23
+Release:        25
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -113,6 +113,7 @@
 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 @@
 %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/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"

++++++ mono-find-requires.diff ++++++
--- 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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to