Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2012-09-26 16:09:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2012-09-25
09:30:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-09-26
16:09:18.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Sep 25 11:25:49 UTC 2012 - co...@suse.com
+
+- remove build-mkbaselibs-sle, the split is no longer necessary
+- remove default requires for devel-32bit
+
+-------------------------------------------------------------------
+Tue Sep 25 08:30:55 UTC 2012 - co...@suse.com
+
+- fix logic for cumulating packages
+
+-------------------------------------------------------------------
Old:
----
build-mkbaselibs-sle.changes
build-mkbaselibs-sle.spec
obs-build-2012.09.24.tar.gz
New:
----
obs-build-2012.09.25.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-initvm.spec ++++++
--- /var/tmp/diff_new_pack.avrU4b/_old 2012-09-26 16:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.avrU4b/_new 2012-09-26 16:09:21.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2012.09.24
+Version: 2012.09.25
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.avrU4b/_old 2012-09-26 16:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.avrU4b/_new 2012-09-26 16:09:21.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 2012.09.24
+Version: 2012.09.25
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: obs-build-%{version}.tar.gz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.avrU4b/_old 2012-09-26 16:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.avrU4b/_new 2012-09-26 16:09:21.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">2012.09.24</param>
+ <param name="version">2012.09.25</param>
<param name="url">git://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
</service>
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.avrU4b/_old 2012-09-26 16:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.avrU4b/_new 2012-09-26 16:09:21.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 2012.09.24
+Version: 2012.09.25
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ obs-build-2012.09.24.tar.gz -> obs-build-2012.09.25.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.09.24/baselibs_global-sle.conf
new/obs-build-2012.09.25/baselibs_global-sle.conf
--- old/obs-build-2012.09.24/baselibs_global-sle.conf 2012-09-24
17:42:00.000000000 +0200
+++ new/obs-build-2012.09.25/baselibs_global-sle.conf 1970-01-01
01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-arch i586 targets x86_64:32bit ia64:x86
-arch i686 targets x86_64:32bit ia64:x86
-arch s390 targets s390x:32bit
-arch ppc targets ppc64:32bit
-arch ppc64 targets ppc:64bit
-arch sparc targets sparc64:32bit
-arch sparcv8 targets sparc64:32bit
-arch sparcv9 targets sparc64:32bit
-arch sparcv9v targets sparc64v:32bit
-arch sparc64 targets sparcv9:64bit
-arch sparc64v targets sparcv9v:64bit
-
-configdir /usr/lib/baselibs-<targettype>/bin
-
-targettype x86 prefix /emul/ia32-linux
-
-targettype x86 extension -x86
-targettype 32bit extension 32
-targettype 64bit extension 64
-
-targetname <name>-<targettype>
-
-+.*/lib(64)?/.*\.(so.*|o|a|la)$
-
-targettype 64bit -^(/usr)?/lib/lib
-targettype 32bit -/lib64/
-targettype x86 -/lib64/
-
-config +.*bin.*-config$
-config -/kde-config$
-
-targettype x86 requires "ia32el"
-targettype x86 prereq "glibc-x86"
-
-package /.(?<!-devel)$/
-post "/sbin/ldconfig"
-
-package /(.*)-devel$/
-targettype x86 block!
-requires "<name> = <version>"
-requires "<match1>-<targettype> = <version>"
-
-package /(.*)-debuginfo$/
-+/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so.*|o|a|la)\.debug$
-+/usr/lib(64)?/debug/.build-id/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.09.24/baselibs_global.conf
new/obs-build-2012.09.25/baselibs_global.conf
--- old/obs-build-2012.09.24/baselibs_global.conf 2012-09-24
17:42:00.000000000 +0200
+++ new/obs-build-2012.09.25/baselibs_global.conf 2012-09-25
13:36:57.000000000 +0200
@@ -35,11 +35,6 @@
package /.(?<!-devel)$/
post "/sbin/ldconfig"
-package /(.*)-devel$/
-targettype x86 block!
-requires "<name> = <version>"
-requires "<match1>-<targettype> = <version>"
-
package /(.*)-debuginfo$/
+/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so.*|o|a|la)\.debug$
+/usr/lib(64)?/debug/.build-id/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.09.24/init_buildsystem
new/obs-build-2012.09.25/init_buildsystem
--- old/obs-build-2012.09.24/init_buildsystem 2012-09-24 17:42:00.000000000
+0200
+++ new/obs-build-2012.09.25/init_buildsystem 2012-09-25 13:36:57.000000000
+0200
@@ -1030,16 +1030,15 @@
((cumulate < 0)) && continue
exec 4>$BUILD_ROOT/.init_b_cache/manifest
for ((num=0; num<=cumulate; num++)) ; do
+ echo ${CUMULATED_LIST[$num]} 1>&4
PKG=${CUMULATED_LIST[$num]##*/}
test "$BUILD_ROOT/.init_b_cache/rpms/$PKG" -ef
"$BUILD_ROOT/${CUMULATED_LIST[$num]}" && continue
rm -f $BUILD_ROOT/${CUMULATED_LIST[$num]}
cp $BUILD_ROOT/.init_b_cache/rpms/$PKG
$BUILD_ROOT/${CUMULATED_LIST[$num]} || cleanup_and_exit 1
- echo ${CUMULATED_LIST[$num]} 1>&4
done
exec 4>&-
- ( chroot $BUILD_ROOT rpm --ignorearch --nodeps -U --oldpackage
--ignoresize --verbose $RPMCHECKOPTS \
- $ADDITIONAL_PARAMS .init_b_cache/manifest 2>&1 || touch
$BUILD_ROOT/exit ) | \
- grep -v "^warning:.*saved as.*rpmorig$"
+ chroot $BUILD_ROOT rpm --ignorearch --nodeps -Uh --oldpackage
--ignoresize --verbose $RPMCHECKOPTS \
+ $ADDITIONAL_PARAMS .init_b_cache/manifest 2>&1 || touch
$BUILD_ROOT/exit
for ((num=0; num<=cumulate; num++)) ; do
rm -f $BUILD_ROOT/${CUMULATED_LIST[$num]}
done
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
