May be, yast2-network should have dependency on yast2-proxy? Otherwise, when upgrading yast2-network, then yast2-proxy is not installed and 'Network settings' dialog doesn't open (an error pop up appears) Michal Filka

Author: mvidner Date: Tue Apr 10 15:35:49 2012 New Revision: 67872

URL: http://svn.opensuse.org/viewcvs/yast?rev=67872&view=rev Log: Moving HTTP proxy (client) configuration to a standalone package.

yast2-network is big enough already; yast2-proxy is independent of it

Added: trunk/proxy/ trunk/proxy/MAINTAINER trunk/proxy/Makefile.cvs trunk/proxy/RPMNAME trunk/proxy/VERSION trunk/proxy/config/ trunk/proxy/config/Makefile.am trunk/proxy/config/cfg_proxy.scr - copied unchanged from r67871, trunk/network/agents/cfg_proxy.scr trunk/proxy/config/proxy.desktop - copied unchanged from r67871, trunk/network/src/config/proxy.desktop trunk/proxy/config/proxy.rnc - copied unchanged from r67871, trunk/network/src/config/proxy.rnc trunk/proxy/config/root_curlrc.scr - copied unchanged from r67871, trunk/network/agents/root_curlrc.scr trunk/proxy/config/root_wgetrc.scr - copied unchanged from r67871, trunk/network/agents/root_wgetrc.scr trunk/proxy/configure.in.in trunk/proxy/package/ trunk/proxy/package/yast2-proxy.changes trunk/proxy/src/ trunk/proxy/src/Makefile.am trunk/proxy/src/clients/ trunk/proxy/src/clients/Makefile.am trunk/proxy/src/clients/proxy.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy.ycp trunk/proxy/src/clients/proxy_auto.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy_auto.ycp trunk/proxy/src/clients/proxy_proposal.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy_proposal.ycp trunk/proxy/src/modules/ trunk/proxy/src/modules/Makefile.am trunk/proxy/src/modules/Proxy.ycp - copied unchanged from r67871, trunk/network/src/modules/Proxy.ycp trunk/proxy/testsuite/ trunk/proxy/testsuite/Makefile.am trunk/proxy/testsuite/tests/ trunk/proxy/testsuite/tests/Proxy.err - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.err trunk/proxy/testsuite/tests/Proxy.out - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.out trunk/proxy/testsuite/tests/Proxy.ycp - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.ycp trunk/proxy/yast2-proxy.spec.in Removed: trunk/network/agents/cfg_proxy.scr trunk/network/agents/root_curlrc.scr trunk/network/agents/root_wgetrc.scr trunk/network/src/clients/proxy.ycp trunk/network/src/clients/proxy_auto.ycp trunk/network/src/clients/proxy_proposal.ycp trunk/network/src/config/proxy.desktop trunk/network/src/config/proxy.rnc trunk/network/src/modules/Proxy.ycp trunk/network/testsuite/tests/Proxy.err trunk/network/testsuite/tests/Proxy.out trunk/network/testsuite/tests/Proxy.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/config/Makefile.am trunk/network/yast2-network.spec.in

Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67872&r1=67871&r2=67872&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Apr 10 15:35:49 2012 @@ -1 +1 @@ -2.22.5 +2.22.6

Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67872&r1=67871&r2=67872&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Apr 10 15:35:49 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 14:45:17 CEST 2012 - mvidner@suse.cz + +- Moved proxy client config to a new package yast2-proxy.rpm +- 2.22.6 + +------------------------------------------------------------------- Thu Mar 29 15:26:35 CEST 2012 - jsuchome@suse.cz - merged proofread texts

Modified: trunk/network/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/Makefile.am?rev=67872&r1=67871&r2=67872&view=diff ============================================================================== --- trunk/network/src/config/Makefile.am (original) +++ trunk/network/src/config/Makefile.am Tue Apr 10 15:35:49 2012 @@ -1,11 +1,9 @@ # Makefile.am for source/network/src/config -# $Id$ desktop_DATA = $(wildcard *.desktop) rncdir = $(schemadir)/autoyast/rnc rnc_DATA = networking.rnc\ - host.rnc\ - proxy.rnc + host.rnc EXTRA_DIST = $(desktop_DATA) $(rnc_DATA)

Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=67872&r1=67871&r2=67872&view=diff ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Tue Apr 10 15:35:49 2012 @@ -89,7 +89,6 @@ @agentdir@/ag_udev_persistent @schemadir@/autoyast/rnc/networking.rnc @schemadir@/autoyast/rnc/host.rnc -@schemadir@/autoyast/rnc/proxy.rnc %dir @docdir@ @docdir@/COPYING

Added: trunk/proxy/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/MAINTAINER?rev=67872&view=auto ============================================================================== --- trunk/proxy/MAINTAINER (added) +++ trunk/proxy/MAINTAINER Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +Martin Vidner

Added: trunk/proxy/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/Makefile.cvs?rev=67872&view=auto ============================================================================== --- trunk/proxy/Makefile.cvs (added) +++ trunk/proxy/Makefile.cvs Tue Apr 10 15:35:49 2012 @@ -0,0 +1,23 @@ +# +# Makefile.cvs +# + +LIB = $(shell y2tool get-lib) + +PREFIX = /usr + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status

Added: trunk/proxy/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/RPMNAME?rev=67872&view=auto ============================================================================== --- trunk/proxy/RPMNAME (added) +++ trunk/proxy/RPMNAME Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +yast2-proxy

Added: trunk/proxy/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/VERSION?rev=67872&view=auto ============================================================================== --- trunk/proxy/VERSION (added) +++ trunk/proxy/VERSION Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +2.22.0

Added: trunk/proxy/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/config/Makefile.am?rev=67872&view=auto ============================================================================== --- trunk/proxy/config/Makefile.am (added) +++ trunk/proxy/config/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,8 @@ +desktop_DATA = proxy.desktop + +rncdir = $(schemadir)/autoyast/rnc +rnc_DATA = proxy.rnc + +scrconf_DATA = $(wildcard *.scr) + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(scrconf_DATA)

Added: trunk/proxy/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/configure.in.in?rev=67872&view=auto ============================================================================== --- trunk/proxy/configure.in.in (added) +++ trunk/proxy/configure.in.in Tue Apr 10 15:35:49 2012 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@

Added: trunk/proxy/package/yast2-proxy.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/package/yast2-proxy.changes?rev=67872&view=auto ============================================================================== --- trunk/proxy/package/yast2-proxy.changes (added) +++ trunk/proxy/package/yast2-proxy.changes Tue Apr 10 15:35:49 2012 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Apr 10 14:49:56 CEST 2012 - mvidner@suse.cz + +- Split off yast2-network +- 2.22.0 +

Added: trunk/proxy/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/Makefile.am?rev=67872&view=auto ============================================================================== --- trunk/proxy/src/Makefile.am (added) +++ trunk/proxy/src/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +SUBDIRS = clients modules

Added: trunk/proxy/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/Makefile.am?rev=67872&view=auto ============================================================================== --- trunk/proxy/src/clients/Makefile.am (added) +++ trunk/proxy/src/clients/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,2 @@ +client_DATA = $(wildcard proxy*.ycp) +EXTRA_DIST = $(client_DATA)

Added: trunk/proxy/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/modules/Makefile.am?rev=67872&view=auto ============================================================================== --- trunk/proxy/src/modules/Makefile.am (added) +++ trunk/proxy/src/modules/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,5 @@ +module_DATA = Proxy.ycp +EXTRA_DIST = $(module_DATA) + +YCPCFLAGS = +include $(top_srcdir)/Makefile.am.common

Added: trunk/proxy/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/testsuite/Makefile.am?rev=67872&view=auto ============================================================================== --- trunk/proxy/testsuite/Makefile.am (added) +++ trunk/proxy/testsuite/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF

Added: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67872&view=auto ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (added) +++ trunk/proxy/yast2-proxy.spec.in Tue Apr 10 15:35:49 2012 @@ -0,0 +1,40 @@ +@HEADER-COMMENT@ + +@HEADER@ +Group: System/YaST +License: GPL v2 or later +# should be required by devtools +BuildRequires: pkgconfig perl-XML-Writer rpm +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools yast2-testsuite + +BuildRequires: yast2 +Requires: yast2 + +PreReq: /bin/rm + +Summary: YaST2 - Proxy Configuration + +%description +This package contains the YaST2 component for proxy configuration. + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +@clientdir@/*.ycp +@moduledir@/*.ycp +@moduledir@/*.ybc +@desktopdir@/*.desktop +@scrconfdir@/*.scr +@schemadir@/autoyast/rnc/proxy.rnc + +%dir @docdir@ +@docdir@/COPYING +%readme @docdir@/README -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org