Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at 2013-09-14 19:08:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-printer (Old)
and /work/SRC/openSUSE:Factory/.yast2-printer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-printer"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-printer/yast2-printer.changes
2013-08-02 15:47:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-printer.new/yast2-printer.changes
2013-09-14 19:08:08.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Sep 13 12:08:29 CEST 2013 - jsm...@suse.de
+
+- test_if_hplip_is_installed.diff is a simple band-aid patch
+ to avoid that the AddDriverDialog works inconsistently
+ regarding HPLIP RPMs (see bnc#837770).
+ The real solution will be implemented later according
+ to what is described in bnc#808315 comment#3.
+
+-------------------------------------------------------------------
+Wed Sep 11 10:58:19 CEST 2013 - jsm...@suse.de
+
+- Using newest yast2-printer-3.0.0.tar.bz2 from YaST:Head
+ that differs only in autodocs-ycp.ami configure configure.ac
+ doc/autodocs/Makefile.in Makefile.am.common src/Makefile.in
+ (i.e. no changes in the actual program's source code files).
+
+-------------------------------------------------------------------
New:
----
test_if_hplip_is_installed.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.6gY17n/_old 2013-09-14 19:08:09.000000000 +0200
+++ /var/tmp/diff_new_pack.6gY17n/_new 2013-09-14 19:08:09.000000000 +0200
@@ -23,6 +23,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-printer-%{version}.tar.bz2
+# Patch0 test_if_hplip_is_installed.diff is a simple band-aid patch to avoid
that the
+# AddDriverDialog works inconsistently regarding HPLIP RPMs (hplip-hpijs
versus hplip)
+# see https://bugzilla.novell.com/show_bug.cgi?id=837770
+# and restore consistent behaviour and sufficiently consistent texts.
+# The real solution will be implemented later according to what is described
+# in https://bugzilla.novell.com/show_bug.cgi?id=808315#c3
+Patch0: test_if_hplip_is_installed.diff
+
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libX11-devel
BuildRequires: yast2
@@ -61,6 +69,11 @@
%prep
%setup -n yast2-printer-%{version}
+# Patch0 test_if_hplip_is_installed.diff is a simple band-aid patch to avoid
that the
+# AddDriverDialog works inconsistently regarding HPLIP RPMs (hplip-hpijs
versus hplip)
+# see https://bugzilla.novell.com/show_bug.cgi?id=837770
+# and restore consistent behaviour and sufficiently consistent texts:
+%patch0
%build
%{_prefix}/bin/y2tool y2autoconf
++++++ test_if_hplip_is_installed.diff ++++++
--- src/include/printer/driveradd.rb.orig 2013-07-30 13:39:28.000000000
+0200
+++ src/include/printer/driveradd.rb 2013-09-13 11:59:59.000000000 +0200
@@ -62,7 +62,7 @@ module Yast
"installed"
)
hplip_installed = Printerlib.TestAndInstallPackage(
- "hplip-hpijs",
+ "hplip",
"installed"
)
manufacturer_PPDs_installed = Printerlib.TestAndInstallPackage(
++++++ yast2-printer-3.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/Makefile.am.common
new/yast2-printer-3.0.0/Makefile.am.common
--- old/yast2-printer-3.0.0/Makefile.am.common 2013-07-31 12:21:12.000000000
+0200
+++ new/yast2-printer-3.0.0/Makefile.am.common 2013-08-13 16:11:31.000000000
+0200
@@ -15,6 +15,7 @@
CLEANFILES = ${ybcfiles}
DISTCLEANFILES = .dep
+if HAS_YCP_MODULES
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
@@ -26,14 +27,16 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(filter %.ycp,client_DATA)"; then \
+check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA)
$(ycpchook) $(ybcfiles)
+ @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \
if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
+ TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \
echo "Checking syntax of $${TO_CHECK}"; \
if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
@@ -43,5 +46,18 @@
echo "Syntax check disabled"; \
fi; \
fi
+ @if test "$(filter %.rb, $^)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.rb, $^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ for f in $${TO_CHECK}; do \
+ if ! ruby -c $$f > /dev/null; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
+ exit 1; \
+ fi; \
+ done; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/autodocs-ycp.ami
new/yast2-printer-3.0.0/autodocs-ycp.ami
--- old/yast2-printer-3.0.0/autodocs-ycp.ami 2013-07-31 12:21:12.000000000
+0200
+++ new/yast2-printer-3.0.0/autodocs-ycp.ami 2013-08-13 16:11:31.000000000
+0200
@@ -17,8 +17,11 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/configure
new/yast2-printer-3.0.0/configure
--- old/yast2-printer-3.0.0/configure 2013-07-31 12:21:16.000000000 +0200
+++ new/yast2-printer-3.0.0/configure 2013-08-13 16:11:35.000000000 +0200
@@ -627,6 +627,8 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+HAS_YCP_MODULES_FALSE
+HAS_YCP_MODULES_TRUE
YCPC
YCPMAKEDEP
YCPDOC
@@ -4553,6 +4555,29 @@
fi
+# handle .dep files in Makefile.am.common if any YCP module is present
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5
+$as_echo_n "checking for YCP modules... " >&6; }
+
+# YCP module file name starts with an upper case letter
+find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1
+ if test -n "$has_ycp_modules"; then
+ HAS_YCP_MODULES_TRUE=
+ HAS_YCP_MODULES_FALSE='#'
+else
+ HAS_YCP_MODULES_TRUE='#'
+ HAS_YCP_MODULES_FALSE=
+fi
+
+
+if test -n "$has_ycp_modules"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
ac_config_files="$ac_config_files Makefile data/Makefile doc/autodocs/Makefile
doc/Makefile src/Makefile testsuite/Makefile tools/Makefile"
@@ -4733,6 +4758,10 @@
as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}";
then
+ as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/configure.ac
new/yast2-printer-3.0.0/configure.ac
--- old/yast2-printer-3.0.0/configure.ac 2013-07-31 12:21:12.000000000
+0200
+++ new/yast2-printer-3.0.0/configure.ac 2013-08-13 16:11:31.000000000
+0200
@@ -1,6 +1,6 @@
dnl configure.ac for yast2-printer
dnl
-dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
AC_INIT(yast2-printer, 3.0.0, http://bugs.opensuse.org/, yast2-printer)
@@ -156,6 +156,19 @@
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_RESULT([not found])
+fi
+
AC_CONFIG_FILES(Makefile data/Makefile
doc/autodocs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/doc/autodocs/Makefile.in
new/yast2-printer-3.0.0/doc/autodocs/Makefile.in
--- old/yast2-printer-3.0.0/doc/autodocs/Makefile.in 2013-07-31
12:21:17.000000000 +0200
+++ new/yast2-printer-3.0.0/doc/autodocs/Makefile.in 2013-08-13
16:11:36.000000000 +0200
@@ -249,8 +249,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-printer-3.0.0/src/Makefile.in
new/yast2-printer-3.0.0/src/Makefile.in
--- old/yast2-printer-3.0.0/src/Makefile.in 2013-07-31 12:21:17.000000000
+0200
+++ new/yast2-printer-3.0.0/src/Makefile.in 2013-08-13 16:11:36.000000000
+0200
@@ -281,7 +281,7 @@
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
-NEWDEP = ${top_builddir}/.dep.new
+@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
CHECK_SYNTAX = true
all: all-am
@@ -620,16 +620,17 @@
# generate dependencies
# two steps not to lose the file if the command fails
# hook: create the links before we look for files
-.dep: $(wildcard *.ycp) ${ycpchook}
- ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
- cat ${NEWDEP} > .dep
- rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@.dep: $(wildcard *.ycp) ${ycpchook}
+@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} >
${NEWDEP}
+@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep
+@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@-include .dep
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(filter %.ycp,client_DATA)"; then \
+check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA)
$(ycpchook) $(ybcfiles)
+ @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \
if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
+ TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \
echo "Checking syntax of $${TO_CHECK}"; \
if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
@@ -639,8 +640,20 @@
echo "Syntax check disabled"; \
fi; \
fi
-
--include .dep
+ @if test "$(filter %.rb, $^)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.rb, $^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ for f in $${TO_CHECK}; do \
+ if ! ruby -c $$f > /dev/null; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
+ exit 1; \
+ fi; \
+ done; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
