Hello community,
here is the log from the commit of package yast2-http-server
checked in at Tue Feb 6 19:17:47 CET 2007.
--------
--- yast2-http-server/yast2-http-server.changes 2007-01-10 14:09:36.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2007-02-06 10:31:15.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 6 10:31:53 CET 2007 - mzugec@suse.de
+
+- missing server modules on 64-bit architecture (#239029)
+- 2.14.6
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.14.5.tar.bz2
New:
----
yast2-http-server-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.t29290/_old 2007-02-06 19:16:34.000000000 +0100
+++ /var/tmp/diff_new_pack.t29290/_new 2007-02-06 19:16:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.14.5)
+# spec file for package yast2-http-server (Version 2.14.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-http-server
-Version: 2.14.5
-Release: 16
+Version: 2.14.6
+Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.14.5.tar.bz2
+Source0: yast2-http-server-2.14.6.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-network yast2-firewall yast2-perl-bindings libzio yast2-dns-server
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.14.5
+%setup -n yast2-http-server-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,9 @@
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog -n yast2-http-server
+* Tue Feb 06 2007 - mzugec@suse.de
+- missing server modules on 64-bit architecture (#239029)
+- 2.14.6
* Wed Jan 10 2007 - mzugec@suse.cz
- add http-server.rnc autoyast validation file (#232808)
* Wed Nov 22 2006 - mzugec@suse.cz
++++++ yast2-http-server-2.14.5.tar.bz2 -> yast2-http-server-2.14.6.tar.bz2 ++++++
++++ 6388 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.14.5/configure.in new/yast2-http-server-2.14.6/configure.in
--- old/yast2-http-server-2.14.5/configure.in 2007-01-10 14:02:19.000000000 +0100
+++ new/yast2-http-server-2.14.6/configure.in 2007-02-06 10:28:43.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-http-server, 2.14.5, http://bugs.opensuse.org/, yast2-http-server)
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
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])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.14.5/Makefile.am new/yast2-http-server-2.14.6/Makefile.am
--- old/yast2-http-server-2.14.5/Makefile.am 2007-01-10 14:02:20.000000000 +0100
+++ new/yast2-http-server-2.14.6/Makefile.am 2007-02-06 10:28:43.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# 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,$(PREFIX)/share/YaST2/data/devtools)
+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)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.14.5/Makefile.am.common new/yast2-http-server-2.14.6/Makefile.am.common
--- old/yast2-http-server-2.14.5/Makefile.am.common 2007-01-10 14:02:20.000000000 +0100
+++ new/yast2-http-server-2.14.6/Makefile.am.common 2007-02-06 10:28:43.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ 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
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.14.5/src/HttpServerWidgets.ycp new/yast2-http-server-2.14.6/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.14.5/src/HttpServerWidgets.ycp 2006-11-22 16:08:30.000000000 +0100
+++ new/yast2-http-server-2.14.6/src/HttpServerWidgets.ycp 2007-02-06 10:32:31.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 34563 2006-11-22 15:08:27Z mzugec $
+ * $Id: HttpServerWidgets.ycp 35879 2007-02-06 09:30:47Z mzugec $
*/
{
@@ -35,6 +35,7 @@
import "FileUtils";
import "Hostname";
import "DNS";
+ import "Arch";
include "http-server/helps.ycp";
@@ -2461,8 +2462,9 @@
else if (event["ID"]:nil == `add_user)
{
// list of all installed modules
- list <string> modules_dir = splitstring(((map) SCR::Execute(.target.bash_output,
- "ls /usr/lib/apache2/|grep so|cut -d. -f1|cut -d_ -f2-"))["stdout"]:"", "\n");
+ list <string> modules_dir = splitstring(((map) SCR::Execute(.target.bash_output,
+ sformat("ls /usr/%1/apache2/|grep so|cut -d. -f1|cut -d_ -f2-",
+ (Arch::ia64()||Arch::mips64()||Arch::ppc64()||Arch::s390_64()||Arch::sparc64()||Arch::x86_64())?"lib64":"lib")))["stdout"]:"", "\n");
list<string> existing = maplist (map mod, YaST::HTTPDData::GetKnownModules(), ``(
mod["name"]:_("unknown")));
// extract unknown modules from all installed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.14.5/VERSION new/yast2-http-server-2.14.6/VERSION
--- old/yast2-http-server-2.14.5/VERSION 2006-11-22 16:01:51.000000000 +0100
+++ new/yast2-http-server-2.14.6/VERSION 2007-02-06 10:31:50.000000000 +0100
@@ -1 +1 @@
-2.14.5
+2.14.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org