commit yast2-inetd

25 Apr 2007

Hello community,

here is the log from the commit of package yast2-inetd
checked in at Thu Apr 26 01:01:44 CEST 2007.

--------

--- yast2-inetd/yast2-inetd.changes	2006-10-27 15:17:22.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-inetd/yast2-inetd.changes	2007-04-25 15:23:04.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 25 15:22:14 CEST 2007 - locilka@suse.cz
+
+- Fixing inetd.rnc file (#242148), patch from ug@suse.de.
+- 2.15.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-inetd-2.14.1.tar.bz2

New:
----
  yast2-inetd-2.15.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-inetd.spec ++++++
--- /var/tmp/diff_new_pack.Zb6149/_old	2007-04-26 01:01:24.000000000 +0200
+++ /var/tmp/diff_new_pack.Zb6149/_new	2007-04-26 01:01:24.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package yast2-inetd (Version 2.14.1)
+# spec file for package yast2-inetd (Version 2.15.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-inetd
-Version:        2.14.1
+Version:        2.15.0
 Release:        1
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-inetd-2.14.1.tar.bz2
+Source0:        yast2-inetd-2.15.0.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-users
 Requires:       yast2 >= 2.13.74
@@ -42,7 +42,7 @@
     Lukas Ocilka <locilka@suse.cz>
 
 %prep
-%setup -n yast2-inetd-2.14.1
+%setup -n yast2-inetd-2.15.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -77,7 +77,10 @@
 /usr/share/YaST2/schema/autoyast/rnc/inetd.rnc
 %doc %{prefix}/share/doc/packages/yast2-inetd
 
-%changelog -n yast2-inetd
+%changelog
+* Wed Apr 25 2007 - locilka@suse.cz
+- Fixing inetd.rnc file (#242148), patch from ug@suse.de.
+- 2.15.0
 * Fri Oct 27 2006 - locilka@suse.cz
 - Adjusted the default configuration according to the current
   status of services.

++++++ yast2-inetd-2.14.1.tar.bz2 -> yast2-inetd-2.15.0.tar.bz2 ++++++
++++ 5147 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-inetd-2.14.1/configure.in new/yast2-inetd-2.15.0/configure.in
--- old/yast2-inetd-2.14.1/configure.in	2006-10-27 15:26:50.000000000 +0200
+++ new/yast2-inetd-2.15.0/configure.in	2007-04-25 15:23:26.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-inetd
 dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - 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-inetd, 2.14.1, http://bugs.opensuse.org/, yast2-inetd)
+AC_INIT(yast2-inetd, 2.15.0, http://bugs.opensuse.org/, yast2-inetd)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.14.1"
+VERSION="2.15.0"
 RPMNAME="yast2-inetd"
 MAINTAINER="Lukas Ocilka <locilka@suse.cz>"
 
@@ -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-inetd-2.14.1/Makefile.am new/yast2-inetd-2.15.0/Makefile.am
--- old/yast2-inetd-2.14.1/Makefile.am	2006-10-27 15:26:50.000000000 +0200
+++ new/yast2-inetd-2.15.0/Makefile.am	2007-04-25 15:23:26.000000000 +0200
@@ -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
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-inetd-2.14.1/Makefile.am.common new/yast2-inetd-2.15.0/Makefile.am.common
--- old/yast2-inetd-2.14.1/Makefile.am.common	2006-10-27 15:26:50.000000000 +0200
+++ new/yast2-inetd-2.15.0/Makefile.am.common	2007-04-25 15:23:26.000000000 +0200
@@ -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-inetd-2.14.1/src/config/inetd.rnc new/yast2-inetd-2.15.0/src/config/inetd.rnc
--- old/yast2-inetd-2.14.1/src/config/inetd.rnc	2006-10-27 15:02:29.000000000 +0200
+++ new/yast2-inetd-2.15.0/src/config/inetd.rnc	2007-04-25 15:20:50.000000000 +0200
@@ -12,6 +12,8 @@
             element protocol { text }? &
             element script   { text }? &
             element server   { text }? &
+            element comment  { text }? &
+            element unparsed { text }? &
             element service  {
 		# Bug 215668 - jing - false positive error
 		#   (attribute "type" from ... not allowed at this point;...)
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-inetd-2.14.1/VERSION new/yast2-inetd-2.15.0/VERSION
--- old/yast2-inetd-2.14.1/VERSION	2006-10-27 15:21:13.000000000 +0200
+++ new/yast2-inetd-2.15.0/VERSION	2007-04-25 15:21:25.000000000 +0200
@@ -1 +1 @@
-2.14.1
+2.15.0


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)