Hello community,
here is the log from the commit of package autoyast2 for openSUSE:13.1 checked
in at 2013-10-21 15:20:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/autoyast2 (Old)
and /work/SRC/openSUSE:13.1/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Changes:
--------
--- /work/SRC/openSUSE:13.1/autoyast2/autoyast2.changes 2013-10-02
14:47:38.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.autoyast2.new/autoyast2.changes 2013-10-21
15:20:50.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Oct 17 15:42:08 CEST 2013 - f...@suse.de
+
+- version 3.0.8
+- fix exception during rules processing (bnc#846203)
+- make rule "totaldisk" work again
+
+-------------------------------------------------------------------
+Mon Oct 14 16:53:40 CEST 2013 - f...@suse.de
+
+- add requires for yast2-runlevel to autoyast2-installation
+ (bnc#844761)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.0.7.tar.bz2
New:
----
autoyast2-3.0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.EjNBtZ/_old 2013-10-21 15:20:50.000000000 +0200
+++ /var/tmp/diff_new_pack.EjNBtZ/_new 2013-10-21 15:20:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.0.7
+Version: 3.0.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,6 +37,7 @@
Requires: yast2 >= 2.16.36
Requires: yast2-core
Requires: yast2-country
+Requires: yast2-runlevel
Requires: yast2-schema
Requires: yast2-storage >= 3.0.5
Requires: yast2-transfer >= 2.21.0
++++++ autoyast2-3.0.7.tar.bz2 -> autoyast2-3.0.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/COPYING new/autoyast2-3.0.8/COPYING
--- old/autoyast2-3.0.7/COPYING 2013-09-30 17:15:22.000000000 +0200
+++ new/autoyast2-3.0.8/COPYING 2013-10-17 15:52:45.000000000 +0200
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/Makefile.am
new/autoyast2-3.0.8/Makefile.am
--- old/autoyast2-3.0.7/Makefile.am 2013-08-28 16:32:57.000000000 +0200
+++ new/autoyast2-3.0.8/Makefile.am 2013-10-14 16:56:56.000000000 +0200
@@ -150,8 +150,10 @@
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
- newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ if [ -f "$$i" ]; then \
+ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ fi \
done
package: check-up-to-date check-tagversion check-textdomain package-local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/Makefile.am.common
new/autoyast2-3.0.8/Makefile.am.common
--- old/autoyast2-3.0.7/Makefile.am.common 2013-08-28 16:32:56.000000000
+0200
+++ new/autoyast2-3.0.8/Makefile.am.common 2013-10-14 16:56:56.000000000
+0200
@@ -1,63 +1,5 @@
# Makefile.am.common -*- Makefile -*-
# Generated file, do not edit!
-modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
-modulebindir = $(moduledir)
-
-ybcfiles = $(filter %.ybc,$(modulebin_DATA))
-
-# suffix mapping: info '(make)Static Usage'
-# apply only to our modules, not external ones
-${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c
-M. -I. -q $(YCPCFLAGS) $<
-
-# files to clean
-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.
-NEWDEP=${top_builddir}/.dep.new
-# 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}
--include .dep
-endif
-
-dist-hook: check-syntax
-
-CHECK_SYNTAX = true
-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, $(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"; \
- exit 1; \
- fi; \
- else \
- 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
-
+# Empty do to drop ycp compilation. When all includes of this file will
removed,
+# then we can remove also this file (otherwise build will fail)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/Makefile.in
new/autoyast2-3.0.8/Makefile.in
--- old/autoyast2-3.0.7/Makefile.in 2013-08-28 16:33:03.000000000 +0200
+++ new/autoyast2-3.0.8/Makefile.in 2013-10-14 16:57:03.000000000 +0200
@@ -212,9 +212,6 @@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -974,8 +971,10 @@
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
- newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ if [ -f "$$i" ]; then \
+ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ fi \
done
package: check-up-to-date check-tagversion check-textdomain package-local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/README new/autoyast2-3.0.8/README
--- old/autoyast2-3.0.7/README 2013-09-30 17:15:22.000000000 +0200
+++ new/autoyast2-3.0.8/README 2013-10-17 15:52:45.000000000 +0200
@@ -1,2 +0,0 @@
-This program/library is part of YaST2
-See the file COPYING for license terms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/VERSION new/autoyast2-3.0.8/VERSION
--- old/autoyast2-3.0.7/VERSION 2013-09-30 14:29:08.000000000 +0200
+++ new/autoyast2-3.0.8/VERSION 2013-10-14 17:08:36.000000000 +0200
@@ -1 +1 @@
-3.0.7
+3.0.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/agents/Makefile.in
new/autoyast2-3.0.8/agents/Makefile.in
--- old/autoyast2-3.0.7/agents/Makefile.in 2013-08-28 16:33:03.000000000
+0200
+++ new/autoyast2-3.0.8/agents/Makefile.in 2013-10-14 16:57:03.000000000
+0200
@@ -111,9 +111,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/configure
new/autoyast2-3.0.8/configure
--- old/autoyast2-3.0.7/configure 2013-08-28 16:33:02.000000000 +0200
+++ new/autoyast2-3.0.8/configure 2013-10-14 16:57:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autoyast2 3.0.3.
+# Generated by GNU Autoconf 2.69 for autoyast2 3.0.6.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='3.0.3'
-PACKAGE_STRING='autoyast2 3.0.3'
+PACKAGE_VERSION='3.0.6'
+PACKAGE_STRING='autoyast2 3.0.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -590,9 +590,6 @@
LIBOBJS
HAS_YCP_MODULES_FALSE
HAS_YCP_MODULES_TRUE
-YCPC
-YCPMAKEDEP
-YCPDOC
STYLESHEET_YCPDOC
STYLESHEET_YDOC
STYLESHEET_CSS
@@ -1249,7 +1246,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 autoyast2 3.0.3 to adapt to many kinds of systems.
+\`configure' configures autoyast2 3.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1320,7 +1317,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 3.0.3:";;
+ short | recursive ) echo "Configuration of autoyast2 3.0.6:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1397,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 3.0.3
+autoyast2 configure 3.0.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1417,7 +1414,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 3.0.3, which was
+It was created by autoyast2 $as_me 3.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2356,7 +2353,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='3.0.3'
+ VERSION='3.0.6'
cat >>confdefs.h <<_ACEOF
@@ -2479,7 +2476,7 @@
-VERSION="3.0.3"
+VERSION="3.0.6"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@suse.de>"
@@ -2685,141 +2682,6 @@
-# Extract the first word of "ycpdoc", so it can be a program name with args.
-set dummy ycpdoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_YCPDOC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $YCPDOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPDOC="$YCPDOC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$devtools_ybindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPDOC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_YCPDOC" && ac_cv_path_YCPDOC="false"
- ;;
-esac
-fi
-YCPDOC=$ac_cv_path_YCPDOC
-if test -n "$YCPDOC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPDOC" >&5
-$as_echo "$YCPDOC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$YCPDOC" = "false"; then
- as_fn_error $? "ycpdoc is not installed" "$LINENO" 5
-fi
-# Extract the first word of "ycpmakedep", so it can be a program name with
args.
-set dummy ycpmakedep; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_YCPMAKEDEP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $YCPMAKEDEP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPMAKEDEP="$YCPMAKEDEP" # Let the user override the test with a
path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$devtools_ybindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPMAKEDEP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_YCPMAKEDEP" && ac_cv_path_YCPMAKEDEP="false"
- ;;
-esac
-fi
-YCPMAKEDEP=$ac_cv_path_YCPMAKEDEP
-if test -n "$YCPMAKEDEP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPMAKEDEP" >&5
-$as_echo "$YCPMAKEDEP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$YCPMAKEDEP" = "false"; then
- as_fn_error $? "ycpmakedep is not installed" "$LINENO" 5
-fi
-# Extract the first word of "ycpc", so it can be a program name with args.
-set dummy ycpc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_YCPC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $YCPC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPC="$YCPC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$bindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_YCPC" && ac_cv_path_YCPC="false"
- ;;
-esac
-fi
-YCPC=$ac_cv_path_YCPC
-if test -n "$YCPC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPC" >&5
-$as_echo "$YCPC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$YCPC" = "false"; then
- as_fn_error $? "ycpc is not installed" "$LINENO" 5
-fi
as_ac_File=`$as_echo
"ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
$devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
$as_echo_n "checking for
$devtools_yast2dir/data/testsuite/Makefile.testsuite... " >&6; }
@@ -3436,7 +3298,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 3.0.3, which was
+This file was extended by autoyast2 $as_me 3.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3489,7 +3351,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-autoyast2 config.status 3.0.3
+autoyast2 config.status 3.0.6
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/autoyast2-3.0.7/configure.ac
new/autoyast2-3.0.8/configure.ac
--- old/autoyast2-3.0.7/configure.ac 2013-08-28 16:32:56.000000000 +0200
+++ new/autoyast2-3.0.8/configure.ac 2013-10-14 16:56:55.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.ac for autoyast2
dnl
-dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.1.6 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(autoyast2, 3.0.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 3.0.6, http://bugs.opensuse.org/, autoyast2)
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="3.0.3"
+VERSION="3.0.6"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@suse.de>"
@@ -137,18 +137,6 @@
AC_SUBST(STYLESHEET_YCPDOC)
-AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir)
-if test "$YCPDOC" = "false"; then
- AC_MSG_ERROR([ycpdoc is not installed])
-fi
-AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir)
-if test "$YCPMAKEDEP" = "false"; then
- AC_MSG_ERROR([ycpmakedep is not installed])
-fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/control/Makefile.in
new/autoyast2-3.0.8/control/Makefile.in
--- old/autoyast2-3.0.7/control/Makefile.in 2013-08-28 16:33:03.000000000
+0200
+++ new/autoyast2-3.0.8/control/Makefile.in 2013-10-14 16:57:03.000000000
+0200
@@ -98,9 +98,8 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(controldir)" \
- "$(DESTDIR)$(modulebindir)"
-DATA = $(control_DATA) $(modulebin_DATA)
+am__installdirs = "$(DESTDIR)$(controldir)"
+DATA = $(control_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -146,9 +145,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -232,19 +228,6 @@
EXTRA_DIST = \
$(control_DATA)
-modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
-modulebindir = $(moduledir)
-ybcfiles = $(filter %.ybc,$(modulebin_DATA))
-
-# files to clean
-CLEANFILES = ${ybcfiles}
-DISTCLEANFILES = .dep
-
-# Needs to be outside "." because of cases
-# where ycpchook contains a symlink to "."
-# Otherwise "." keeps being newer than .dep and we loop.
-@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
-CHECK_SYNTAX = true
all: all-am
.SUFFIXES:
@@ -300,27 +283,6 @@
@list='$(control_DATA)'; test -n "$(controldir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(controldir)'; $(am__uninstall_files_from_dir)
-install-modulebinDATA: $(modulebin_DATA)
- @$(NORMAL_INSTALL)
- @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(modulebindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(modulebindir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(modulebindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(modulebindir)" || exit $$?; \
- done
-
-uninstall-modulebinDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(modulebindir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -360,15 +322,12 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(controldir)" "$(DESTDIR)$(modulebindir)"; do \
+ for dir in "$(DESTDIR)$(controldir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -393,12 +352,10 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -423,7 +380,7 @@
info-am:
-install-data-am: install-controlDATA install-modulebinDATA
+install-data-am: install-controlDATA
install-dvi: install-dvi-am
@@ -467,67 +424,27 @@
ps-am:
-uninstall-am: uninstall-controlDATA uninstall-modulebinDATA
+uninstall-am: uninstall-controlDATA
.MAKE: check-am install-am install-strip
.PHONY: all all-am check check-am check-local clean clean-generic \
- dist-hook distclean distclean-generic distdir dvi dvi-am html \
- html-am info info-am install install-am install-controlDATA \
+ distclean distclean-generic distdir dvi dvi-am html html-am \
+ info info-am install install-am install-controlDATA \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-modulebinDATA \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-controlDATA uninstall-modulebinDATA
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-controlDATA
check-local:
xmllint --relaxng $(controldir)/control.rng --noout $(control_DATA)
-# suffix mapping: info '(make)Static Usage'
-# apply only to our modules, not external ones
-${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c
-M. -I. -q $(YCPCFLAGS) $<
-# generate dependencies
-# two steps not to lose the file if the command fails
-# hook: create the links before we look for files
-@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) $(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, $(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"; \
- exit 1; \
- fi; \
- else \
- 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
+# Empty do to drop ycp compilation. When all includes of this file will
removed,
+# then we can remove also this file (otherwise build will fail)
# 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/doc/Makefile.in
new/autoyast2-3.0.8/doc/Makefile.in
--- old/autoyast2-3.0.7/doc/Makefile.in 2013-08-28 16:33:03.000000000 +0200
+++ new/autoyast2-3.0.8/doc/Makefile.in 2013-10-14 16:57:03.000000000 +0200
@@ -157,9 +157,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/doc/autodocs/Makefile.in
new/autoyast2-3.0.8/doc/autodocs/Makefile.in
--- old/autoyast2-3.0.7/doc/autodocs/Makefile.in 2013-08-28
16:33:03.000000000 +0200
+++ new/autoyast2-3.0.8/doc/autodocs/Makefile.in 2013-10-14
16:57:03.000000000 +0200
@@ -163,9 +163,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/modconfig/Makefile.in
new/autoyast2-3.0.8/modconfig/Makefile.in
--- old/autoyast2-3.0.7/modconfig/Makefile.in 2013-08-28 16:33:03.000000000
+0200
+++ new/autoyast2-3.0.8/modconfig/Makefile.in 2013-10-14 16:57:04.000000000
+0200
@@ -147,9 +147,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/scripts/Makefile.in
new/autoyast2-3.0.8/scripts/Makefile.in
--- old/autoyast2-3.0.7/scripts/Makefile.in 2013-08-28 16:33:03.000000000
+0200
+++ new/autoyast2-3.0.8/scripts/Makefile.in 2013-10-14 16:57:04.000000000
+0200
@@ -115,9 +115,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/src/Makefile.in
new/autoyast2-3.0.8/src/Makefile.in
--- old/autoyast2-3.0.7/src/Makefile.in 2013-08-28 16:33:04.000000000 +0200
+++ new/autoyast2-3.0.8/src/Makefile.in 2013-10-14 16:57:04.000000000 +0200
@@ -97,8 +97,8 @@
am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(ybindir)" \
"$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \
"$(DESTDIR)$(fillupdir)" "$(DESTDIR)$(moduledir)" \
- "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(schemafilesdir)" \
- "$(DESTDIR)$(scrconfdir)" "$(DESTDIR)$(yncludedir)"
+ "$(DESTDIR)$(schemafilesdir)" "$(DESTDIR)$(scrconfdir)" \
+ "$(DESTDIR)$(yncludedir)"
SCRIPTS = $(agent_SCRIPTS) $(ybin_SCRIPTS)
SOURCES =
DIST_SOURCES =
@@ -108,8 +108,7 @@
*) (install-info --version) >/dev/null 2>&1;; \
esac
DATA = $(client_DATA) $(desktop_DATA) $(fillup_DATA) $(module_DATA) \
- $(modulebin_DATA) $(schemafiles_DATA) $(scrconf_DATA) \
- $(ynclude_DATA)
+ $(schemafiles_DATA) $(scrconf_DATA) $(ynclude_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -155,9 +154,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -331,19 +327,6 @@
fillup/sysconfig.autoinstall
EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA)
$(agent_SCRIPTS) $(schemafiles_DATA) $(ybin_SCRIPTS) $(desktop_DATA)
$(fillup_DATA)
-modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
-modulebindir = $(moduledir)
-ybcfiles = $(filter %.ybc,$(modulebin_DATA))
-
-# files to clean
-CLEANFILES = ${ybcfiles}
-DISTCLEANFILES = .dep
-
-# Needs to be outside "." because of cases
-# where ycpchook contains a symlink to "."
-# Otherwise "." keeps being newer than .dep and we loop.
-@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
-CHECK_SYNTAX = true
all: all-am
.SUFFIXES:
@@ -532,27 +515,6 @@
@list='$(module_DATA)'; test -n "$(moduledir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
-install-modulebinDATA: $(modulebin_DATA)
- @$(NORMAL_INSTALL)
- @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(modulebindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(modulebindir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(modulebindir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(modulebindir)" || exit $$?; \
- done
-
-uninstall-modulebinDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(modulebin_DATA)'; test -n "$(modulebindir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(modulebindir)'; $(am__uninstall_files_from_dir)
install-schemafilesDATA: $(schemafiles_DATA)
@$(NORMAL_INSTALL)
@list='$(schemafiles_DATA)'; test -n "$(schemafilesdir)" || list=; \
@@ -655,14 +617,11 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(ybindir)"
"$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(fillupdir)"
"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"
"$(DESTDIR)$(schemafilesdir)" "$(DESTDIR)$(scrconfdir)"
"$(DESTDIR)$(yncludedir)"; do \
+ for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(ybindir)"
"$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(fillupdir)"
"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(schemafilesdir)"
"$(DESTDIR)$(scrconfdir)" "$(DESTDIR)$(yncludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -687,12 +646,10 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -719,8 +676,8 @@
install-data-am: install-agentSCRIPTS install-clientDATA \
install-desktopDATA install-fillupDATA install-moduleDATA \
- install-modulebinDATA install-schemafilesDATA \
- install-scrconfDATA install-ybinSCRIPTS install-yncludeDATA
+ install-schemafilesDATA install-scrconfDATA \
+ install-ybinSCRIPTS install-yncludeDATA
install-dvi: install-dvi-am
@@ -766,74 +723,33 @@
uninstall-am: uninstall-agentSCRIPTS uninstall-clientDATA \
uninstall-desktopDATA uninstall-fillupDATA \
- uninstall-moduleDATA uninstall-modulebinDATA \
- uninstall-schemafilesDATA uninstall-scrconfDATA \
- uninstall-ybinSCRIPTS uninstall-yncludeDATA
+ uninstall-moduleDATA uninstall-schemafilesDATA \
+ uninstall-scrconfDATA uninstall-ybinSCRIPTS \
+ uninstall-yncludeDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic dist-hook \
- distclean distclean-generic distdir dvi dvi-am html html-am \
- info info-am install install-agentSCRIPTS install-am \
- install-clientDATA install-data install-data-am \
- install-desktopDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-fillupDATA install-html \
- install-html-am install-info install-info-am install-man \
- install-moduleDATA install-modulebinDATA install-pdf \
- install-pdf-am install-ps install-ps-am \
- install-schemafilesDATA install-scrconfDATA install-strip \
- install-ybinSCRIPTS install-yncludeDATA installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \
- uninstall-clientDATA uninstall-desktopDATA \
- uninstall-fillupDATA uninstall-moduleDATA \
- uninstall-modulebinDATA uninstall-schemafilesDATA \
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-agentSCRIPTS install-am install-clientDATA \
+ install-data install-data-am install-desktopDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-fillupDATA \
+ install-html install-html-am install-info install-info-am \
+ install-man install-moduleDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-schemafilesDATA \
+ install-scrconfDATA install-strip install-ybinSCRIPTS \
+ install-yncludeDATA installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-agentSCRIPTS uninstall-am uninstall-clientDATA \
+ uninstall-desktopDATA uninstall-fillupDATA \
+ uninstall-moduleDATA uninstall-schemafilesDATA \
uninstall-scrconfDATA uninstall-ybinSCRIPTS \
uninstall-yncludeDATA
-# suffix mapping: info '(make)Static Usage'
-# apply only to our modules, not external ones
-${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c
-M. -I. -q $(YCPCFLAGS) $<
-# generate dependencies
-# two steps not to lose the file if the command fails
-# hook: create the links before we look for files
-@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) $(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, $(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"; \
- exit 1; \
- fi; \
- else \
- 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
+# Empty do to drop ycp compilation. When all includes of this file will
removed,
+# then we can remove also this file (otherwise build will fail)
# 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/src/modules/AutoInstallRules.rb
new/autoyast2-3.0.8/src/modules/AutoInstallRules.rb
--- old/autoyast2-3.0.7/src/modules/AutoInstallRules.rb 2013-09-26
17:42:59.000000000 +0200
+++ new/autoyast2-3.0.8/src/modules/AutoInstallRules.rb 2013-10-17
15:46:37.000000000 +0200
@@ -21,6 +21,7 @@
Yast.import "AutoinstConfig"
Yast.import "XML"
Yast.import "Storage"
+ Yast.import "StorageControllers"
Yast.import "Kernel"
Yast.import "Mode"
Yast.import "Profile"
@@ -266,6 +267,7 @@
# Disk sizes
#
+ StorageControllers.Initialize # ugly hack, Storage.GetTargetMap should
simply work without it
storage = Storage.GetTargetMap
_PhysicalTargetMap = Builtins.filter(storage) do |k, v|
Storage.IsRealDisk(v)
@@ -276,7 +278,8 @@
@totaldisk = Ops.add(@totaldisk, size_in_mb)
{ "device" => k, "size" => size_in_mb }
end
- Builtins.y2debug("disksize: %1", @disksize)
+ Builtins.y2milestone("disksize: %1", @disksize)
+ Ops.set(@ATTR, "totaldisk", @totaldisk)
#
# MAC
#
@@ -455,7 +458,7 @@
ismatch = false
go_on = true
- ProbeRules if !rulelist.empty?
+ AutoInstallRules.ProbeRules if !rulelist.empty?
Builtins.foreach(rulelist) do |ruleset|
Builtins.y2milestone("Ruleset: %1", ruleset)
rls = ruleset.keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.0.7/xslt/Makefile.in
new/autoyast2-3.0.8/xslt/Makefile.in
--- old/autoyast2-3.0.7/xslt/Makefile.in 2013-08-28 16:33:04.000000000
+0200
+++ new/autoyast2-3.0.8/xslt/Makefile.in 2013-10-14 16:57:04.000000000
+0200
@@ -187,9 +187,6 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
