Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2012-03-30 14:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server", Maintainer is "jsrain@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2011-10-03 09:25:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2012-03-30 14:21:16.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 15:11:25 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.21.0.tar.bz2 New: ---- yast2-http-server-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.2uN0T4/_old 2012-03-30 14:21:20.000000000 +0200 +++ /var/tmp/diff_new_pack.2uN0T4/_new 2012-03-30 14:21:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-http-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-http-server -Version: 2.21.0 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-http-server-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ -BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite -Requires: yast2-network yast2-perl-bindings libzio +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libxslt +BuildRequires: libzio +BuildRequires: perl-XML-Writer +BuildRequires: popt-devel +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-network +BuildRequires: yast2-packagemanager-devel +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-testsuite +Requires: libzio +Requires: yast2-network +Requires: yast2-perl-bindings # DnsServerApi moved to yast2.rpm (bnc#392606) # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 @@ -38,6 +47,8 @@ BuildArch: noarch Summary: YaST2 - HTTP Server Configuration +License: GPL-2.0 +Group: System/YaST %description This package contains the YaST2 component for HTTP server (Apache2) @@ -47,23 +58,22 @@ %setup -n yast2-http-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 @@ -79,9 +89,9 @@ /usr/share/YaST2/clients/http-server.ycp /usr/share/YaST2/clients/http-server_*.ycp /usr/share/YaST2/modules/* -%{prefix}/share/applications/YaST2/http-server.desktop +%{_prefix}/share/applications/YaST2/http-server.desktop /usr/share/YaST2/scrconf/* /usr/lib/YaST2/servers_non_y2/* -%doc %{prefix}/share/doc/packages/yast2-http-server +%doc %{_prefix}/share/doc/packages/yast2-http-server %changelog ++++++ yast2-http-server-2.21.0.tar.bz2 -> yast2-http-server-2.22.0.tar.bz2 ++++++ ++++ 1748 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.21.0/VERSION new/yast2-http-server-2.22.0/VERSION --- old/yast2-http-server-2.21.0/VERSION 2011-09-29 11:08:57.000000000 +0200 +++ new/yast2-http-server-2.22.0/VERSION 2012-03-29 15:11:49.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.22.0 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.21.0/configure.in new/yast2-http-server-2.22.0/configure.in --- old/yast2-http-server-2.21.0/configure.in 2011-09-29 11:10:17.000000000 +0200 +++ new/yast2-http-server-2.22.0/configure.in 2012-03-29 15:11:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-http-server dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.21.0, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.22.0, http://bugs.opensuse.org/, yast2-http-server) 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.21.0" +VERSION="2.22.0" RPMNAME="yast2-http-server" MAINTAINER="YaST2 Maintainers <yast2-maintainers@suse.de>" 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.21.0/src/YaPI/HTTPD.pm new/yast2-http-server-2.22.0/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.21.0/src/YaPI/HTTPD.pm 2011-09-29 11:08:12.000000000 +0200 +++ new/yast2-http-server-2.22.0/src/YaPI/HTTPD.pm 2012-03-29 15:11:14.000000000 +0200 @@ -676,7 +676,7 @@ } elsif( $hostid ne 'default' and $tmp->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf( __("Illegal key in vhost '%s'."),$tmp->{KEY}), + return $self->SetError( summary => sprintf( __("Illegal key in virtual host '%s'."),$tmp->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $tmp ); @@ -759,7 +759,7 @@ } if( $key->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf(__("Illegal key in vhost '%s'."), $key->{KEY}), + return $self->SetError( summary => sprintf(__("Illegal key in virtual host '%s'."), $key->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $key ); 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.21.0/src/helps.ycp new/yast2-http-server-2.22.0/src/helps.ycp --- old/yast2-http-server-2.21.0/src/helps.ycp 2011-09-29 11:08:13.000000000 +0200 +++ new/yast2-http-server-2.22.0/src/helps.ycp 2012-03-29 15:11:14.000000000 +0200 @@ -178,12 +178,13 @@ + _("<p><big><b>Server Resolution</b></big><br> Apache2 must be able to determine which virtual host settings it should use to create a response for an HTTP request. -In principle, there are two basic approaches. If using HTTP headers +There are two basic approaches. If using HTTP headers from the incoming request, the server looks up the host name specified by the HTTP request headers. The other possibility is to determine the virtual host by the IP address used by the client when connecting to the server. -If you plan to configure SSL based vhost, use <b>Resolution via IP address</b> -Consult the Apache2 manual for further details.</p>\n"), +If you plan to configure SSL-based vhost, use <b>Resolution via IP address</b> +Consult the Apache2 manual for further details.</p> +"), // advanced new host dialog 1/5 "set_vhost" : _("<p><b><big>Details for New Host</big></b><br> This dialog allows you to specify additional information about a new virtual host.</p>") @@ -191,8 +192,11 @@ +_("<p>Select <b>Enable CGI Support</b> to run CGI scripts in the path in <b>CGI Directory Path</b> using the alias <tt>/cgi-bin/</tt>.</p>") // advanced new host dialog 3/5 - +_("<p>For HTTPS access to this virtual host, select <b>Enable SSL Support</b>.\n -Then enter the path for the certificate file in <b>Certificate File Path</b>.This option is available only for IP based vhosts.</p>") + +_("<p>For HTTPS access to this virtual host, select <b>Enable SSL Support</b>. + +Then enter the path for the certificate file in <b>Certificate File +Path</b>.This option is only available for IP-based vhosts.</p> +") // advanced new host dialog 4/5 +_("<p>In <b>Directory Index</b>, enter a space-separated list of files that Apache should look for and provide when a URL for a directory (one that ends in <tt>/</tt>) is requested. The first matching file found is provided.</p>") // advanced new host dialog 5/5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org