Hello community,
here is the log from the commit of package yast2-python-bindings for
openSUSE:Factory checked in at 2013-06-25 07:39:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-python-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-python-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-python-bindings"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-python-bindings/yast2-python-bindings.changes
2013-02-28 10:24:18.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-python-bindings.new/yast2-python-bindings.changes
2013-06-25 14:47:45.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 11 16:39:52 UTC 2013 - [email protected]
+
+- install to correct python directory (fixes file conflict with
+ python-base)
+- 2.20.2
+
+-------------------------------------------------------------------
@@ -117 +123,0 @@
-
Old:
----
yast2-python-bindings-2.20.1.tar.bz2
New:
----
yast2-python-bindings-2.20.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-python-bindings.spec ++++++
--- /var/tmp/diff_new_pack.73SALT/_old 2013-06-25 14:47:45.000000000 +0200
+++ /var/tmp/diff_new_pack.73SALT/_new 2013-06-25 14:47:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-python-bindings
-Version: 2.20.1
+Version: 2.20.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,7 +74,7 @@
done
rm $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2lang_python.la
-rm $RPM_BUILD_ROOT/%{_libdir}/python/site-packages/libYCP.la
+rm $RPM_BUILD_ROOT/%{python_sitearch}/libYCP.la
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -86,7 +86,7 @@
# libYCP goes elsewhere
# %dir %{_libdir}/python
-%{_libdir}/python/site-packages
+%{python_sitearch}/*
%doc %{_prefix}/share/doc/packages/yast2-python-bindings
%changelog
++++++ yast2-python-bindings-2.20.1.tar.bz2 ->
yast2-python-bindings-2.20.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/Makefile.am
new/yast2-python-bindings-2.20.2/Makefile.am
--- old/yast2-python-bindings-2.20.1/Makefile.am 2013-02-11
17:34:58.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/Makefile.am 2013-06-21
17:46:43.000000000 +0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/Makefile.in
new/yast2-python-bindings-2.20.2/Makefile.in
--- old/yast2-python-bindings-2.20.1/Makefile.in 2013-02-11
17:35:10.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/Makefile.in 2013-06-21
17:46:55.000000000 +0200
@@ -1066,19 +1066,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/VERSION
new/yast2-python-bindings-2.20.2/VERSION
--- old/yast2-python-bindings-2.20.1/VERSION 2013-01-22 11:49:25.000000000
+0100
+++ new/yast2-python-bindings-2.20.2/VERSION 2013-06-14 17:10:53.000000000
+0200
@@ -1 +1 @@
-2.20.1
+2.20.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/configure
new/yast2-python-bindings-2.20.2/configure
--- old/yast2-python-bindings-2.20.1/configure 2013-02-11 17:35:09.000000000
+0100
+++ new/yast2-python-bindings-2.20.2/configure 2013-06-21 17:46:53.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-python-bindings 2.20.1.
+# Generated by GNU Autoconf 2.69 for yast2-python-bindings 2.20.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-python-bindings'
PACKAGE_TARNAME='yast2-python-bindings'
-PACKAGE_VERSION='2.20.1'
-PACKAGE_STRING='yast2-python-bindings 2.20.1'
+PACKAGE_VERSION='2.20.2'
+PACKAGE_STRING='yast2-python-bindings 2.20.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1377,7 +1377,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-python-bindings 2.20.1 to adapt to many kinds of
systems.
+\`configure' configures yast2-python-bindings 2.20.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1449,7 +1449,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-python-bindings
2.20.1:";;
+ short | recursive ) echo "Configuration of yast2-python-bindings
2.20.2:";;
esac
cat <<\_ACEOF
@@ -1567,7 +1567,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-python-bindings configure 2.20.1
+yast2-python-bindings configure 2.20.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-python-bindings $as_me 2.20.1, which was
+It was created by yast2-python-bindings $as_me 2.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2959,7 +2959,7 @@
# Define the identity of the package.
PACKAGE='yast2-python-bindings'
- VERSION='2.20.1'
+ VERSION='2.20.2'
cat >>confdefs.h <<_ACEOF
@@ -3082,7 +3082,7 @@
-VERSION="2.20.1"
+VERSION="2.20.2"
RPMNAME="yast2-python-bindings"
MAINTAINER="YaST2 Maintainers <[email protected]>"
@@ -16073,7 +16073,7 @@
CFLAGS="${CFLAGS} ${PYTHON_CFLAGS}"
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print
sys.version[:3]'`
eval yast2dir4python='"'$yast2dir'"'
@@ -16624,7 +16624,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-python-bindings $as_me 2.20.1, which was
+This file was extended by yast2-python-bindings $as_me 2.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16690,7 +16690,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-python-bindings config.status 2.20.1
+yast2-python-bindings config.status 2.20.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/configure.in
new/yast2-python-bindings-2.20.2/configure.in
--- old/yast2-python-bindings-2.20.1/configure.in 2013-02-11
17:34:58.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/configure.in 2013-06-21
17:46:43.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-python-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-python-bindings, 2.20.1, http://bugs.opensuse.org/,
yast2-python-bindings)
+AC_INIT(yast2-python-bindings, 2.20.2, http://bugs.opensuse.org/,
yast2-python-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.1"
+VERSION="2.20.2"
RPMNAME="yast2-python-bindings"
MAINTAINER="YaST2 Maintainers <[email protected]>"
@@ -186,7 +186,7 @@
CFLAGS="${CFLAGS} ${PYTHON_CFLAGS}"
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print
sys.version@<:@:3@:>@'`
AC_SUBST(PYTHON_VENDORARCH)
eval yast2dir4python='"'$yast2dir'"'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-python-bindings-2.20.1/configure.in.in
new/yast2-python-bindings-2.20.2/configure.in.in
--- old/yast2-python-bindings-2.20.1/configure.in.in 2013-01-22
11:49:25.000000000 +0100
+++ new/yast2-python-bindings-2.20.2/configure.in.in 2013-06-18
23:30:54.000000000 +0200
@@ -29,7 +29,7 @@
CXXFLAGS="${CXXFLAGS} ${PYTHON_CFLAGS}"
## Where to install modules
-PYTHON_VENDORARCH=${libdir}/python
+PYTHON_VENDORARCH=${libdir}/python`python -c 'import sys; print
sys.version@<:@:3@:>@'`
AC_SUBST(PYTHON_VENDORARCH)
## make a literal of yast2dir so that it can be used in python instead
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
