Hello community, here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2013-10-19 11:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old) and /work/SRC/openSUSE:Factory/.yast2-proxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-proxy" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2013-08-01 11:09:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-proxy.new/yast2-proxy.changes 2013-10-19 11:20:59.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 19 15:04:31 UTC 2013 - [email protected] + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + +------------------------------------------------------------------- Old: ---- yast2-proxy-3.0.0.tar.bz2 New: ---- yast2-proxy-3.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-proxy.spec ++++++ --- /var/tmp/diff_new_pack.js1Emi/_old 2013-10-19 11:20:59.000000000 +0200 +++ /var/tmp/diff_new_pack.js1Emi/_new 2013-10-19 11:20:59.000000000 +0200 @@ -17,18 +17,18 @@ Name: yast2-proxy -Version: 3.0.0 +Version: 3.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-proxy-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 # should be required by devtools BuildRequires: perl-XML-Writer BuildRequires: pkgconfig BuildRequires: rpm BuildRequires: update-desktop-files -BuildRequires: yast2-devtools +BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-testsuite BuildRequires: yast2 @@ -51,43 +51,24 @@ This package contains the YaST2 component for proxy configuration. %prep -%setup -n yast2-proxy-%{version} +%setup -n %{name}-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./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 +%yast_build %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 - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done - -%clean -rm -rf "$RPM_BUILD_ROOT" +%yast_install %files %defattr(-,root,root) -/usr/share/YaST2/clients/*.rb -/usr/share/YaST2/modules/*.rb -/usr/share/YaST2/include/proxy -%{_prefix}/share/applications/YaST2/*.desktop -/usr/share/YaST2/scrconf/*.scr -/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc - -%dir %{_prefix}/share/doc/packages/yast2-proxy -%{_prefix}/share/doc/packages/yast2-proxy/COPYING -%readme %{_prefix}/share/doc/packages/yast2-proxy/README +%{yast_clientdir}/*.rb +%{yast_moduledir}/*.rb +%{yast_yncludedir}/proxy +%{yast_desktopdir}/*.desktop +%{yast_scrconfdir}/*.scr +%{yast_schemadir}/autoyast/rnc/proxy.rnc + +%dir %{yast_docdir} +%{yast_docdir}/COPYING %changelog ++++++ yast2-proxy-3.0.0.tar.bz2 -> yast2-proxy-3.1.0.tar.bz2 ++++++ ++++ 12003 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-proxy-3.0.0/Makefile.am new/yast2-proxy-3.1.0/Makefile.am --- old/yast2-proxy-3.0.0/Makefile.am 2013-07-31 12:23:58.000000000 +0200 +++ new/yast2-proxy-3.1.0/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,196 +0,0 @@ -# Emacs: -*- makefile -*- -# -# Toplevel Makefile.am for a YaST2 subproject -# -# -- This file is generated by y2automake - DO NOT EDIT! -- -# (Edit ./SUBDIRS instead) -# - -#where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool - -VERSION = $(shell cat $(srcdir)/VERSION) -RPMNAME = $(shell cat $(srcdir)/RPMNAME) -SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) -ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) - -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) - -# 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) -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 \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - -# less strict; prefer bzip2 -AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools install m4 snippets -# argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -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 - cmp -s $< $@ || cp -f $< $@ - -# create bzip2ed tar and make some sanity checks -$(RPMNAME)-$(VERSION).tar.bz2: checkpo dist-bzip2 - @if [ `bunzip2 -c $(RPMNAME)-$(VERSION).tar.bz2 | wc --bytes` = 0 ] ; then \ - echo "Error: created tar is empty" ; \ - exit 1 ; \ - fi - -CLEANFILES = -MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec - -POT_DST = $(shell find -type d -name testsuite -prune , \ - -type f -name "*.pot") - -EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ - $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ - $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) - -show-extra-dist: - @echo $(EXTRA_DIST) - -# info '(automake)Conditionals' -if CREATE_PKGCONFIG -# create the file here instead of by configure -# 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 config.status - ./config.status --file=$@:$< - -if CREATE_PKGCONFIG_NOARCH -pkgconfigdata_DATA = $(RPMNAME).pc -else -pkgconfig_DATA = $(RPMNAME).pc -endif - -EXTRA_DIST += $(RPMNAME).pc.in -endif - -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - -pot: - $(Y2TOOL) y2makepot -s $(srcdir) - -install-pot: pot - @POT_DST=`find -type d -name testsuite -prune , \ - -type f -name "*.pot"` ; \ - if [ -n "$$POT_DST" ] ; then \ - echo "mkdir -p $(DESTDIR)$(potdir)" ; \ - mkdir -p $(DESTDIR)$(potdir) ; \ - list="$$POT_DST"; \ - for I in $$list ; \ - do \ - echo $$I ; \ - if [ "$$I" == "pot" ] ; then \ - continue ; \ - fi ; \ - echo "$(INSTALL_DATA) $$I $(DESTDIR)$(potdir)" ; \ - $(INSTALL_DATA) $$I $(DESTDIR)$(potdir) ; \ - done ; \ - fi - -spellcheck: pot - $(Y2TOOL) pot-spellcheck - -# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) - -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - -package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 - rm -f package/$(RPMNAME)-*.tar.bz2 - rm -f package/*~ - rm -f package/*.bak - rm -f package/*.auto - mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ - echo "You have to install yast2-devtools to making a package"; \ - false; \ - 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} ; \ - done - -package: check-up-to-date check-tagversion check-textdomain package-local - -TAGVERSION = $(Y2TOOL) tagversion - -# check if there is no modified files and all commits were pushed -check-up-to-date: - if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ - (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ - fi - -check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ - [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) - -check-parse-old: - @if [ `find -type f -name "*.ycp" | wc -l` -gt 0 -a "$(RPMNAME)" != "yast2-core" ] ; then \ - echo "Running parseycp..." ; \ - parseycp -q -R ; \ - else \ - echo "Not running parseycp." ; \ - fi - -check-parse: - @echo "Not running parseycp." - -check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) - -stable: checkin-stable - -checkin-stable: package - $(Y2TOOL) checkin-stable - - -# For po/ modules -checkpo: - test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo -# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox -# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = config src testsuite 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-proxy-3.0.0/Makefile.am.common new/yast2-proxy-3.1.0/Makefile.am.common --- old/yast2-proxy-3.0.0/Makefile.am.common 2013-07-31 12:23:58.000000000 +0200 +++ new/yast2-proxy-3.1.0/Makefile.am.common 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -# 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 - -# 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} - -dist-hook: check-syntax - -CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,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-proxy-3.0.0/Makefile.cvs new/yast2-proxy-3.1.0/Makefile.cvs --- old/yast2-proxy-3.0.0/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-3.1.0/Makefile.cvs 2013-10-16 09:33:51.000000000 +0200 @@ -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 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-proxy-3.0.0/README new/yast2-proxy-3.1.0/README --- old/yast2-proxy-3.0.0/README 2013-07-31 12:24:08.000000000 +0200 +++ new/yast2-proxy-3.1.0/README 1970-01-01 01:00:00.000000000 +0100 @@ -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' --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-proxy-3.0.0/Rakefile new/yast2-proxy-3.1.0/Rakefile --- old/yast2-proxy-3.0.0/Rakefile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-3.1.0/Rakefile 2013-10-16 09:33:51.000000000 +0200 @@ -0,0 +1,6 @@ +require "yast/rake" + +Yast::Tasks.configuration do |conf| + #lets ignore license check for now + conf.skip_license_check << /.*/ +end 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-proxy-3.0.0/VERSION new/yast2-proxy-3.1.0/VERSION --- old/yast2-proxy-3.0.0/VERSION 2013-07-30 13:39:55.000000000 +0200 +++ new/yast2-proxy-3.1.0/VERSION 2013-10-16 09:33:51.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.1.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-proxy-3.0.0/configure.ac new/yast2-proxy-3.1.0/configure.ac --- old/yast2-proxy-3.0.0/configure.ac 2013-07-31 12:23:58.000000000 +0200 +++ new/yast2-proxy-3.1.0/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -dnl configure.ac for yast2-proxy -dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- -dnl (edit configure.ac.in or configure.in.in instead) - -AC_INIT(yast2-proxy, 3.0.0, http://bugs.opensuse.org/, yast2-proxy) -dnl Check for presence of file 'RPMNAME' -AC_CONFIG_SRCDIR([RPMNAME]) - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_TARGET -dnl Perform program name transformation -AC_ARG_PROGRAM - -AC_PREFIX_DEFAULT(/usr) - -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) - -dnl Important YaST2 variables -VERSION="3.0.0" -RPMNAME="yast2-proxy" -MAINTAINER="Martin Vidner <[email protected]>" - -dnl pkgconfig honors lib64 -pkgconfigdir=\${libdir}/pkgconfig -pkgconfigdatadir=\${datadir}/pkgconfig -yast2dir=\${prefix}/share/YaST2 - -ybindir=\${prefix}/lib/YaST2/bin -# FIXME duplicates execcompdir -ystartupdir=\${prefix}/lib/YaST2 -plugindir=\${libdir}/YaST2/plugin -includedir=\${prefix}/include/YaST2 -potdir=\${docdir}/pot - -docdir=\${prefix}/share/doc/packages/$RPMNAME -mandir=\${prefix}/share/man - -execcompdir=\${prefix}/lib/YaST2 -agentdir=${execcompdir}/servers_non_y2 - -ydatadir=${yast2dir}/data -imagedir=${yast2dir}/images -themedir=${yast2dir}/theme -localedir=${yast2dir}/locale -clientdir=${yast2dir}/clients -moduledir=${yast2dir}/modules -yncludedir=${yast2dir}/include -schemadir=${yast2dir}/schema -scrconfdir=${yast2dir}/scrconf -desktopdir=\${prefix}/share/applications/YaST2 - -AC_SUBST(VERSION) -AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) - -AC_SUBST(pkgconfigdir) -AC_SUBST(pkgconfigdatadir) - -AC_SUBST(yast2dir) - -AC_SUBST(ybindir) -AC_SUBST(ystartupdir) -AC_SUBST(plugindir) -AC_SUBST(includedir) -AC_SUBST(potdir) -AC_SUBST(execcompdir) - -AC_SUBST(docdir) -AC_SUBST(mandir) - -AC_SUBST(ydatadir) -AC_SUBST(imagedir) -AC_SUBST(themedir) -AC_SUBST(localedir) -AC_SUBST(clientdir) -AC_SUBST(moduledir) -AC_SUBST(yncludedir) -AC_SUBST(schemadir) -AC_SUBST(scrconfdir) -AC_SUBST(agentdir) -AC_SUBST(desktopdir) - -fillupdir_d="/var/adm/fillup-templates" -AC_ARG_WITH(fillupdir, - AS_HELP_STRING([--with-fillupdir=DIR], - [where to place fillup templates (default $fillupdir_d.]), - [ fillupdir="$withval" ], - [ fillupdir="$fillupdir_d" ]) -AC_SUBST(fillupdir) - - - -dnl Checks for programs. -AC_PROG_INSTALL -dnl The YCP interpreter checks whether dependent ybc files are older -dnl so we must preserve their timestamps -INSTALL="${INSTALL} -p" -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl pkgconfig -AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) -dnl devtools -dnl ... - -dnl no need for AC_ARG_VAR -AC_PATH_PROG(XGETTEXT, xgettext) -if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) -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` - -dnl producing pkg-config for others? -AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) -AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) - -dbdir=${devtools_yast2dir}/data/docbook -STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl -STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl -STYLESHEET_CSS=${dbdir}/css/yast2docs.css -STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl -STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl -AC_SUBST(STYLESHEET_HTML) -AC_SUBST(STYLESHEET_PDF) -AC_SUBST(STYLESHEET_CSS) -AC_SUBST(STYLESHEET_YDOC) -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]) -]) - - -AC_CONFIG_FILES(Makefile config/Makefile -src/Makefile -testsuite/Makefile) -AC_OUTPUT - 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-proxy-3.0.0/missing new/yast2-proxy-3.1.0/missing --- old/yast2-proxy-3.0.0/missing 2013-07-31 12:24:03.000000000 +0200 +++ new/yast2-proxy-3.1.0/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,330 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2012-01-06.18; # UTC - -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. - -# 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, 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, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <[email protected]>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: 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-proxy-3.0.0/package/yast2-proxy.changes new/yast2-proxy-3.1.0/package/yast2-proxy.changes --- old/yast2-proxy-3.0.0/package/yast2-proxy.changes 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-3.1.0/package/yast2-proxy.changes 2013-10-16 09:33:51.000000000 +0200 @@ -0,0 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 19 15:04:31 UTC 2013 - [email protected] + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + +------------------------------------------------------------------- +Wed Jul 31 08:38:05 UTC 2013 - [email protected] + +- converted from YCP to Ruby by YCP Killer + (https://github.com/yast/ycp-killer) +- version 3.0.0 + +------------------------------------------------------------------- +Tue Jul 16 07:56:11 UTC 2013 - [email protected] + +- move an include statement to the top level (needed for Ruby + translation) +- 2.24.0 + +------------------------------------------------------------------- +Wed Apr 11 11:15:23 CEST 2012 - [email protected] + +- Moved over one forgotten file. +- 2.22.1 + +------------------------------------------------------------------- +Tue Apr 10 14:49:56 CEST 2012 - [email protected] + +- Split off yast2-network +- 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-proxy-3.0.0/package/yast2-proxy.spec new/yast2-proxy-3.1.0/package/yast2-proxy.spec --- old/yast2-proxy-3.0.0/package/yast2-proxy.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-3.1.0/package/yast2-proxy.spec 2013-10-16 09:33:51.000000000 +0200 @@ -0,0 +1,73 @@ +# +# spec file for package yast2-proxy +# +# Copyright (c) 2013 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: yast2-proxy +Version: 3.1.0 +Release: 0 + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{name}-%{version}.tar.bz2 + +Group: System/YaST +License: GPL-2.0+ +# should be required by devtools +BuildRequires: perl-XML-Writer pkgconfig rpm +BuildRequires: update-desktop-files +BuildRequires: yast2-testsuite +BuildRequires: yast2-devtools >= 3.0.6 + +BuildRequires: yast2 +Requires: yast2 + +# we split off that one +Conflicts: yast2-network < 2.22.6 + +PreReq: /bin/rm +BuildArch: noarch + +Requires: yast2-ruby-bindings >= 1.0.0 + +Summary: YaST2 - Proxy Configuration +Url: http://en.opensuse.org/Portal:YaST + +%description +This package contains the YaST2 component for proxy configuration. + +%prep +%setup -n %{name}-%{version} + +%build +%yast_build + +%install +%yast_install + + +%files +%defattr(-,root,root) +%{yast_clientdir}/*.rb +%{yast_moduledir}/*.rb +%{yast_yncludedir}/proxy +%{yast_desktopdir}/*.desktop +%{yast_scrconfdir}/*.scr +%{yast_schemadir}/autoyast/rnc/proxy.rnc + +%dir %{yast_docdir} +%{yast_docdir}/COPYING + +%changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
