Hello community,
here is the log from the commit of package yast2-tftp-server for
openSUSE:Factory checked in at 2011-11-05 11:37:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-tftp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-tftp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tftp-server", Maintainer is "mvid...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-tftp-server/yast2-tftp-server.changes
2011-10-04 18:04:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-tftp-server.new/yast2-tftp-server.changes
2011-11-05 12:23:27.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 3 14:08:48 CET 2011 - loci...@suse.cz
+
+- Fixed testsuite
+- 2.21.2
+
+-------------------------------------------------------------------
Old:
----
yast2-tftp-server-2.21.1.tar.bz2
New:
----
yast2-tftp-server-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tftp-server.spec ++++++
--- /var/tmp/diff_new_pack.6ExaI7/_old 2011-11-05 12:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.6ExaI7/_new 2011-11-05 12:26:57.000000000 +0100
@@ -19,16 +19,14 @@
Name: yast2-tftp-server
-Version: 2.21.1
+Version: 2.21.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-tftp-server-%{version}.tar.bz2
-Prefix: /usr
-
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
@@ -47,23 +45,23 @@
%setup -n yast2-tftp-server-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -77,8 +75,8 @@
/usr/share/YaST2/include/tftp-server/*
/usr/share/YaST2/clients/tftp-server*.ycp
/usr/share/YaST2/modules/TftpServer.*
-%{prefix}/share/applications/YaST2/tftp-server.desktop
+%{_prefix}/share/applications/YaST2/tftp-server.desktop
/usr/share/YaST2/scrconf/etc_xinetd_d_tftp.scr
-%doc %{prefix}/share/doc/packages/yast2-tftp-server
+%doc %{_prefix}/share/doc/packages/yast2-tftp-server
%changelog
++++++ yast2-tftp-server-2.21.1.tar.bz2 -> yast2-tftp-server-2.21.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.21.1/Makefile.am
new/yast2-tftp-server-2.21.2/Makefile.am
--- old/yast2-tftp-server-2.21.1/Makefile.am 2011-09-26 15:08:35.000000000
+0200
+++ new/yast2-tftp-server-2.21.2/Makefile.am 2011-11-03 14:07:51.000000000
+0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.21.1/Makefile.in
new/yast2-tftp-server-2.21.2/Makefile.in
--- old/yast2-tftp-server-2.21.1/Makefile.in 2011-09-26 15:08:38.000000000
+0200
+++ new/yast2-tftp-server-2.21.2/Makefile.in 2011-11-03 14:07:54.000000000
+0100
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+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 \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.21.1/VERSION
new/yast2-tftp-server-2.21.2/VERSION
--- old/yast2-tftp-server-2.21.1/VERSION 2011-09-26 15:06:33.000000000
+0200
+++ new/yast2-tftp-server-2.21.2/VERSION 2011-11-03 14:09:19.000000000
+0100
@@ -1 +1 @@
-2.21.1
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tftp-server-2.21.1/configure.in
new/yast2-tftp-server-2.21.2/configure.in
--- old/yast2-tftp-server-2.21.1/configure.in 2011-09-26 15:08:35.000000000
+0200
+++ new/yast2-tftp-server-2.21.2/configure.in 2011-11-03 14:07:51.000000000
+0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-tftp-server
dnl
-dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-tftp-server, 2.21.1, http://bugs.opensuse.org/,
yast2-tftp-server)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-tftp-server-2.21.1/testsuite/tests/readwrite.out
new/yast2-tftp-server-2.21.2/testsuite/tests/readwrite.out
--- old/yast2-tftp-server-2.21.1/testsuite/tests/readwrite.out 2011-09-26
15:06:10.000000000 +0200
+++ new/yast2-tftp-server-2.21.2/testsuite/tests/readwrite.out 2011-11-03
14:08:19.000000000 +0100
@@ -5,7 +5,6 @@
Read .etc.xinetd_d.tftp.value.tftp.server_args "-s -v /srv/boot"
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init |
/usr/bin/grep -q '[0-6]:on'" 0
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup |
/usr/bin/grep -q '[0-6]:on'" 0
-Execute .target.bash "/sbin/service SuSEfirewall2_init status"
$["TERM":"raw"] 0
Return true
Write .etc.xinetd_d.tftp.value.tftp."{" "" true
Write .etc.xinetd_d.tftp.value_type.tftp."{" 1 true
@@ -22,5 +21,4 @@
Read .init.scripts.comment "xinetd" $["inetd":$[], "network":$[],
"networkmanager":$[], "xinetd":$[]]
Execute .target.bash "/usr/bin/killall in.tftpd" 0
Execute .target.bash_output "/sbin/service xinetd restart"
$["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"]
-Execute .target.bash "/sbin/service SuSEfirewall2_init status"
$["TERM":"raw"] 0
Return true
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
