Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Thu Jun 9 08:55:19 CEST 2011.
-------- rpm.changes: same change calling whatdependson for head-i586 New: ---- mimetype.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:51.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.0 -Release: 7 +Release: 8 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:51.000000000 +0200 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.0 -Release: 13 +Release: 15 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -83,6 +83,7 @@ Patch46: whatrequires-doc.diff Patch47: remove-brp-strips.diff Patch48: requires-ge-macro.diff +Patch49: mimetype.diff Patch50: debugedit-canon-fix.diff Patch51: finddebuginfo-absolute-links.diff Patch52: firmware.diff @@ -177,7 +178,7 @@ %patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 -%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 +%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 -P 79 ++++++ buildpipe.diff ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:52.000000000 +0200 @@ -1,5 +1,5 @@ --- build/rpmfc.c.orig 2011-06-06 11:27:32.000000000 +0000 -+++ build/rpmfc.c 2011-06-08 10:00:38.000000000 +0000 ++++ build/rpmfc.c 2011-06-06 11:28:47.000000000 +0000 @@ -165,12 +165,14 @@ static int sigpipe_init(void) fcntl(_sigpipe[1], F_SETFD, (fcntl(_sigpipe[1], F_GETFD)|FD_CLOEXEC)); /* XXX SIGPIPE too, but NSPR disables it already, dont mess with it */ @@ -15,15 +15,3 @@ close(_sigpipe[0]); close(_sigpipe[1]); _sigpipe[0] = -1; -@@ -298,10 +300,9 @@ static StringBuf getOutputFrom(ARGV_t ar - appendStringBuf(readBuff, buf); - } - -- /* Child exited, we're done */ -+ /* Child exited, we're maybe done */ - if (FD_ISSET(sigpipe, &ibits)) { - while (read(sigpipe, buf, sizeof(buf)) > 0) {}; -- break; - } - } - ++++++ fileattrs.diff ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:52.000000000 +0200 @@ -1,14 +1,28 @@ -Index: fileattrs/debuginfo.attr -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fileattrs/debuginfo.attr 2011-06-06 16:16:00.853820498 +0200 +--- ./fileattrs/Makefile.am.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/Makefile.am 2011-05-19 12:50:54.000000000 +0000 +@@ -6,6 +6,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs + + fattrs_DATA = \ + desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \ +- pkgconfig.attr python.attr ocaml.attr script.attr mono.attr ++ pkgconfig.attr python.attr ocaml.attr script.attr mono.attr \ ++ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr + + EXTRA_DIST = $(fattrs_DATA) +--- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/debuginfo.attr 2011-05-18 09:27:58.000000000 +0000 @@ -0,0 +1,2 @@ +%__debuginfo_provides %{_rpmconfigdir}/debuginfo.prov +%__debuginfo_path ^/usr/lib/debug/ -Index: fileattrs/elf.attr -=================================================================== ---- fileattrs/elf.attr.orig 2011-06-06 16:15:01.591403879 +0200 -+++ fileattrs/elf.attr 2011-06-06 16:16:00.853820498 +0200 +--- ./fileattrs/desktop.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/desktop.attr 2011-05-18 09:27:58.000000000 +0000 +@@ -1,2 +1,2 @@ +-%__desktop_provides %{_rpmconfigdir}/desktop-file.prov +-%__desktop_path ^%{_datadir}/applications/.*\\.desktop$ ++%__desktop_provides %{_rpmconfigdir}/mimetypes.prov ++%__desktop_path .*\\.desktop$ +--- ./fileattrs/elf.attr.orig 2011-05-18 09:28:33.000000000 +0000 ++++ ./fileattrs/elf.attr 2011-05-18 09:33:20.000000000 +0000 @@ -1,4 +1,5 @@ %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} @@ -16,70 +30,43 @@ +%__elf_magic ^ELF (32|64)-bit.*executable %__elf_flags exeonly +%__elf_exclude_path ^/usr/lib/debug/ -Index: fileattrs/elflib.attr -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fileattrs/elflib.attr 2011-06-06 16:16:00.854820404 +0200 +--- ./fileattrs/elflib.attr.orig 2011-05-18 09:28:23.000000000 +0000 ++++ ./fileattrs/elflib.attr 2011-05-18 09:31:30.000000000 +0000 @@ -0,0 +1,4 @@ +%__elflib_provides %{_rpmconfigdir}/elfdeps --assume-exec --provides %{?__filter_GLIBC_PRIVATE:--filter-private} +%__elflib_requires %{_rpmconfigdir}/elfdeps --assume-exec --requires %{?__filter_GLIBC_PRIVATE:--filter-private} +%__elflib_magic ^ELF (32|64)-bit.*shared object +%__elflib_exclude_path ^/usr/lib/debug/ -Index: fileattrs/firmware.attr -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fileattrs/firmware.attr 2011-06-06 16:16:00.854820404 +0200 +--- ./fileattrs/firmware.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/firmware.attr 2011-05-18 09:27:58.000000000 +0000 @@ -0,0 +1,2 @@ +%__firmware_provides %{_rpmconfigdir}/firmware.prov +%__firmware_path /lib/firmware/ -Index: fileattrs/ksyms.attr -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fileattrs/ksyms.attr 2011-06-06 16:16:00.854820404 +0200 +--- ./fileattrs/ksyms.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/ksyms.attr 2011-05-18 09:27:58.000000000 +0000 @@ -0,0 +1,4 @@ +%__ksyms_provides %{_rpmconfigdir}/find-provides.ksyms %name +%__ksyms_requires %{_rpmconfigdir}/find-requires.ksyms %name +%__ksyms_supplements %{_rpmconfigdir}/find-supplements.ksyms %name +%__ksyms_path (/lib/modules/.*\.ko(\.gz)?)|(/boot/vmlinu[xz].*)$ -Index: fileattrs/Makefile.am -=================================================================== ---- fileattrs/Makefile.am.orig 2011-06-06 16:15:01.590403974 +0200 -+++ fileattrs/Makefile.am 2011-06-06 16:16:08.852066946 +0200 -@@ -5,7 +5,8 @@ include $(top_srcdir)/rpm.am - fattrsdir = $(rpmconfigdir)/fileattrs - - fattrs_DATA = \ -- desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \ -- pkgconfig.attr python.attr ocaml.attr script.attr mono.attr -+ elf.attr font.attr libtool.attr perl.attr perllib.attr \ -+ pkgconfig.attr python.attr ocaml.attr script.attr mono.attr \ -+ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr - - EXTRA_DIST = $(fattrs_DATA) -Index: fileattrs/perl.attr -=================================================================== ---- fileattrs/perl.attr.orig 2011-06-06 16:15:01.591403879 +0200 -+++ fileattrs/perl.attr 2011-06-06 16:16:00.855820310 +0200 +--- ./fileattrs/perl.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/perl.attr 2011-05-18 09:27:58.000000000 +0000 @@ -1,3 +1,4 @@ -%__perl_requires %{_rpmconfigdir}/perl.req +# disabled for now +#%__perl_requires %{_rpmconfigdir}/perl.req %__perl_magic ^.*perl .*$ %__perl_flags exeonly -Index: fileattrs/perllib.attr -=================================================================== ---- fileattrs/perllib.attr.orig 2011-06-06 16:15:01.591403879 +0200 -+++ fileattrs/perllib.attr 2011-06-06 16:16:00.855820310 +0200 +--- ./fileattrs/perllib.attr.orig 2011-05-19 09:59:05.000000000 +0000 ++++ ./fileattrs/perllib.attr 2011-05-19 09:58:29.000000000 +0000 @@ -1,3 +1,4 @@ %__perllib_provides %{_rpmconfigdir}/perl.prov -%__perllib_requires %{_rpmconfigdir}/perl.req +#disabled for now +#%__perllib_requires %{_rpmconfigdir}/perl.req %__perllib_magic ^Perl[[:digit:]] module source.* -Index: fileattrs/sysvinit.attr -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fileattrs/sysvinit.attr 2011-06-06 16:16:00.856820216 +0200 +--- ./fileattrs/sysvinit.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++ ./fileattrs/sysvinit.attr 2011-05-18 09:27:58.000000000 +0000 @@ -0,0 +1,2 @@ +%__sysvinit_provides %{_rpmconfigdir}/sysvinitdeps.sh --provides +%__sysvinit_path ^/etc/init\.d/ ++++++ firmware.diff ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:52.000000000 +0200 @@ -1,17 +1,17 @@ Index: autodeps/linux.prov =================================================================== ---- autodeps/linux.prov.orig 2011-06-08 13:28:10.000000000 +0200 -+++ autodeps/linux.prov 2011-06-08 13:28:51.755445342 +0200 -@@ -11,6 +11,7 @@ solist=($(printf "%s\n" "${filelist[@]}" - pythonlist= +--- autodeps/linux.prov.orig ++++ autodeps/linux.prov +@@ -12,6 +12,7 @@ pythonlist= tcllist= monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) + mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$")) +firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/")) # # --- Alpha does not mark 64bit dependencies -@@ -59,6 +60,11 @@ done | sort -u - printf "%s\n" "${tcllist[@]}" | /usr/lib/rpm/tcl.prov | sort -u +@@ -65,6 +66,11 @@ done | sort -u + printf "%s\n" "${mimetypelist[@]}" | /usr/lib/rpm/mimetypes.prov | sort -u # +# --- firmware files @@ -24,8 +24,8 @@ if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then Index: scripts/firmware.prov =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ scripts/firmware.prov 2011-06-08 13:28:33.117204009 +0200 +--- /dev/null ++++ scripts/firmware.prov @@ -0,0 +1,8 @@ +#!/bin/sh +# Add firmware files in /lib/firmware into RPM provides ++++++ fontprovides.diff ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:52.000000000 +0200 @@ -1,17 +1,15 @@ -Index: autodeps/linux.prov -=================================================================== ---- autodeps/linux.prov.orig 2011-06-08 13:37:46.951974468 +0200 -+++ autodeps/linux.prov 2011-06-08 13:37:46.967972960 +0200 -@@ -15,6 +15,8 @@ pythonlist=($(printf "%s\n" "${filelist[ - tcllist= +--- ./autodeps/linux.prov.orig 2011-05-11 16:39:09.000000000 +0000 ++++ ./autodeps/linux.prov 2011-05-11 16:40:49.000000000 +0000 +@@ -16,6 +16,8 @@ tcllist= monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) + mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$")) firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/")) +pkgconfiglist=($(printf "%s\n" "${filelist[@]}" | egrep '\.pc$')) +fontlist=($(printf "%s\n" "${filelist[@]}" | egrep -i "/usr/share/fonts/.*\.(ttf|otf|pfa)$")) # # --- Alpha does not mark 64bit dependencies -@@ -80,6 +82,16 @@ if [ -x $MONO_PREFIX/bin/mono -a -n "$mo +@@ -86,6 +88,16 @@ if [ -x $MONO_PREFIX/bin/mono -a -n "$mo fi # @@ -28,10 +26,8 @@ # --- Kernel module exported symbols [ -x /usr/lib/rpm/find-provides.ksyms ] && printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-provides.ksyms "$@" -Index: autodeps/linux.req -=================================================================== ---- autodeps/linux.req.orig 2011-06-08 13:37:46.951974468 +0200 -+++ autodeps/linux.req 2011-06-08 13:37:46.968972865 +0200 +--- ./autodeps/linux.req.orig 2011-05-11 16:39:09.000000000 +0000 ++++ ./autodeps/linux.req 2011-05-11 16:40:49.000000000 +0000 @@ -34,6 +34,7 @@ perllist=() pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/lib[^/]*/python.\..')) tcllist=() ++++++ mimetype.diff ++++++ Index: autodeps/linux.prov =================================================================== --- autodeps/linux.prov.orig +++ autodeps/linux.prov @@ -11,6 +11,7 @@ solist=($(printf "%s\n" "${filelist[@]}" pythonlist= tcllist= monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) +mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$")) # # --- Alpha does not mark 64bit dependencies @@ -59,6 +60,11 @@ done | sort -u printf "%s\n" "${tcllist[@]}" | /usr/lib/rpm/tcl.prov | sort -u # +# --- mimetypes in .desktop files +[ -x /usr/lib/rpm/mimetypes.prov -a -n "$mimetypelist" ] && + printf "%s\n" "${mimetypelist[@]}" | /usr/lib/rpm/mimetypes.prov | sort -u + +# # --- Mono exes/dlls : ${MONO_PREFIX=/usr} if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then ++++++ pythondeps.diff ++++++ --- /var/tmp/diff_new_pack.jur6Wq/_old 2011-06-09 08:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jur6Wq/_new 2011-06-09 08:54:52.000000000 +0200 @@ -1,7 +1,5 @@ -Index: autodeps/linux.prov -=================================================================== ---- autodeps/linux.prov.orig 2011-06-08 13:31:39.000000000 +0200 -+++ autodeps/linux.prov 2011-06-08 13:31:39.191646314 +0200 +--- ./autodeps/linux.prov.orig 2011-05-11 15:59:31.000000000 +0000 ++++ ./autodeps/linux.prov 2011-05-11 16:39:09.000000000 +0000 @@ -11,7 +11,7 @@ filelist=($(printf "%s\n" "${filelist[@] solist=($(printf "%s\n" "${filelist[@]}" | grep "\\.so" | grep -v "^/lib/ld.so" | \ tr '\n' '\0' | xargs -0 -r file -L | grep "ELF.*shared object" | \ @@ -10,8 +8,8 @@ +pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/bin/python.\..$')) tcllist= monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) - firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/")) -@@ -54,8 +54,8 @@ done | sort -u + mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$")) +@@ -55,8 +55,8 @@ done | sort -u # # --- Python modules. @@ -22,10 +20,8 @@ # # --- Tcl modules. -Index: autodeps/linux.req -=================================================================== ---- autodeps/linux.req.orig 2011-06-08 13:31:38.000000000 +0200 -+++ autodeps/linux.req 2011-06-08 13:31:39.191646314 +0200 +--- ./autodeps/linux.req.orig 2011-05-11 14:28:45.000000000 +0000 ++++ ./autodeps/linux.req 2011-05-11 16:39:09.000000000 +0000 @@ -31,7 +31,7 @@ liblist=($(printf "%s\0" "${filelist[@]} interplist=() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org