openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2006
- 1 participants
- 1670 discussions
Hello community,
here is the log from the commit of package yast2-iscsi-server
checked in at Fri Oct 27 18:49:33 CEST 2006.
--------
--- yast2-iscsi-server/yast2-iscsi-server.changes 2006-06-01 11:25:37.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-iscsi-server/yast2-iscsi-server.changes 2006-10-27 10:09:57.000000000 +0200
@@ -4 +4,3 @@
-- fixed #180205 - because of gettext problem, one string wasn't mark for translation
+- fixed #180205 - because of gettext problem,
+ one string wasn't mark for translation
+- 2.14.0
Old:
----
yast2-iscsi-server-2.13.22.tar.bz2
New:
----
yast2-iscsi-server-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-server.spec ++++++
--- /var/tmp/diff_new_pack.N3paT5/_old 2006-10-27 18:47:53.000000000 +0200
+++ /var/tmp/diff_new_pack.N3paT5/_new 2006-10-27 18:47:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-server (Version 2.13.22)
+# spec file for package yast2-iscsi-server (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-iscsi-server
-Version: 2.13.22
-Release: 2
-License: GPL
+Version: 2.14.0
+Release: 1
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-server-2.13.22.tar.bz2
+Source0: yast2-iscsi-server-2.14.0.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2
@@ -29,7 +29,7 @@
%prep
-%setup -n yast2-iscsi-server-2.13.22
+%setup -n yast2-iscsi-server-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,7 +65,9 @@
%changelog -n yast2-iscsi-server
* Thu Jun 01 2006 - mzugec(a)suse.cz
-- fixed #180205 - because of gettext problem, one string wasn't mark for translation
+- fixed #180205 - because of gettext problem,
+ one string wasn't mark for translation
+- 2.14.0
* Fri May 19 2006 - mzugec(a)suse.cz
- fixed #177060 incorrect storing data between dialogs
* Thu May 18 2006 - mzugec(a)suse.cz
++++++ yast2-iscsi-server-2.13.22.tar.bz2 -> yast2-iscsi-server-2.14.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.22/VERSION new/yast2-iscsi-server-2.14.0/VERSION
--- old/yast2-iscsi-server-2.13.22/VERSION 2006-05-19 16:43:45.000000000 +0200
+++ new/yast2-iscsi-server-2.14.0/VERSION 2006-10-23 18:02:49.000000000 +0200
@@ -1 +1 @@
-2.13.22
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.22/configure new/yast2-iscsi-server-2.14.0/configure
--- old/yast2-iscsi-server-2.13.22/configure 2006-06-01 10:39:03.000000000 +0200
+++ new/yast2-iscsi-server-2.14.0/configure 2006-10-27 10:06:29.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.22.
+# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.14.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-iscsi-server'
PACKAGE_TARNAME='yast2-iscsi-server'
-PACKAGE_VERSION='2.13.22'
-PACKAGE_STRING='yast2-iscsi-server 2.13.22'
+PACKAGE_VERSION='2.14.0'
+PACKAGE_STRING='yast2-iscsi-server 2.14.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-iscsi-server 2.13.22 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-server 2.14.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.22:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-server 2.14.0:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-iscsi-server configure 2.13.22
+yast2-iscsi-server configure 2.14.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-iscsi-server $as_me 2.13.22, which was
+It was created by yast2-iscsi-server $as_me 2.14.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-iscsi-server'
- VERSION='2.13.22'
+ VERSION='2.14.0'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.22"
+VERSION="2.14.0"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-iscsi-server $as_me 2.13.22, which was
+This file was extended by yast2-iscsi-server $as_me 2.14.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-iscsi-server config.status 2.13.22
+yast2-iscsi-server config.status 2.14.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.22/configure.in new/yast2-iscsi-server-2.14.0/configure.in
--- old/yast2-iscsi-server-2.13.22/configure.in 2006-06-01 10:38:55.000000000 +0200
+++ new/yast2-iscsi-server-2.14.0/configure.in 2006-10-27 10:06:18.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-iscsi-server
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-server, 2.13.22, http://bugs.opensuse.org/, yast2-iscsi-server)
+AC_INIT(yast2-iscsi-server, 2.14.0, http://bugs.opensuse.org/, yast2-iscsi-server)
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.13.22"
+VERSION="2.14.0"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package freetype2
checked in at Fri Oct 27 18:49:17 CEST 2006.
--------
--- freetype2/freetype2.changes 2006-10-20 12:35:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/freetype2/freetype2.changes 2006-10-27 17:25:55.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 27 17:25:35 CEST 2006 - mfabian(a)suse.de
+
+- Bugzilla #158573: update to 2.2.1.20061027.
+
+-------------------------------------------------------------------
ft2demos.changes: same change
Old:
----
freetype-2.2.1.20061013.tar.bz2
ft2demos-2.2.1.20061013.tar.bz2
New:
----
freetype-2.2.1.20061027.tar.bz2
ft2demos-2.2.1.20061027.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freetype2.spec ++++++
--- /var/tmp/diff_new_pack.mgz2Ne/_old 2006-10-27 18:47:24.000000000 +0200
+++ /var/tmp/diff_new_pack.mgz2Ne/_new 2006-10-27 18:47:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package freetype2 (Version 2.2.1.20061013)
+# spec file for package freetype2 (Version 2.2.1.20061027)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,18 @@
# norootforbuild
Name: freetype2
-License: Other License(s), see package, Other uncritical OpenSource License
+License: Other uncritical OpenSource License, Other License(s), see package
Group: System/Libraries
Autoreqprov: on
-Version: 2.2.1.20061013
-Release: 3
+Version: 2.2.1.20061027
+Release: 1
URL: http://www.freetype.org
Summary: A TrueType Font Library
# CVS repository:
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype login
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co freetype2
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co ft2demos
-Source0: http://download.savannah.gnu.org/releases/freetype/freetype-2.2.1.20061013.…
+Source0: http://download.savannah.gnu.org/releases/freetype/freetype-2.2.1.20061027.…
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.2.1.tar.b…
# pregenerated to avoid build-dependence on python:
Source2: freetype-doc-reference.tar.bz2
@@ -128,6 +128,8 @@
/usr/share/aclocal/*
%changelog -n freetype2
+* Fri Oct 27 2006 - mfabian(a)suse.de
+- Bugzilla #158573: update to 2.2.1.20061027.
* Fri Oct 20 2006 - mfabian(a)suse.de
- disable the recent fixes of the byte code interpreter because
if breaks the rendering of "Luxi Mono"
++++++ ft2demos.spec ++++++
--- /var/tmp/diff_new_pack.mgz2Ne/_old 2006-10-27 18:47:24.000000000 +0200
+++ /var/tmp/diff_new_pack.mgz2Ne/_new 2006-10-27 18:47:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ft2demos (Version 2.2.1.20061013)
+# spec file for package ft2demos (Version 2.2.1.20061027)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,18 +18,18 @@
%if %suse_version > 1000
Supplements: fonts-config
%endif
-Version: 2.2.1.20061013
-Release: 3
-%define freetype_version 2.2.1.20061013
+Version: 2.2.1.20061027
+Release: 1
+%define freetype_version 2.2.1.20061027
URL: http://www.freetype.org
Summary: Freetype2 Utilities and Demo Programs
# CVS repository:
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype login
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co freetype2
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co ft2demos
-Source0: http://savannah.nongnu.org/download/freetype/freetype-2.2.1.20061013.tar.bz2
+Source0: http://savannah.nongnu.org/download/freetype/freetype-2.2.1.20061027.tar.bz2
NoSource: 0
-Source1: http://savannah.nongnu.org/download/freetype/ft2demos-2.2.1.20061013.tar.bz2
+Source1: http://savannah.nongnu.org/download/freetype/ft2demos-2.2.1.20061027.tar.bz2
# pregenerated to avoid build-dependence on python:
Source2: freetype-doc-reference.tar.bz2
Patch3: freetype2-bitmap-foundry.patch
@@ -118,6 +118,8 @@
%{_bindir}/testname
%changelog -n ft2demos
+* Fri Oct 27 2006 - mfabian(a)suse.de
+- Bugzilla #158573: update to 2.2.1.20061027.
* Fri Oct 20 2006 - mfabian(a)suse.de
- disable the recent fixes of the byte code interpreter because
if breaks the rendering of "Luxi Mono"
++++++ freetype-2.2.1.20061013.tar.bz2 -> freetype-2.2.1.20061027.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/ChangeLog new/freetype-2.2.1.20061027/ChangeLog
--- old/freetype-2.2.1.20061013/ChangeLog 2006-10-12 08:20:44.000000000 +0200
+++ new/freetype-2.2.1.20061027/ChangeLog 2006-10-27 17:21:03.000000000 +0200
@@ -1,3 +1,70 @@
+2006-10-24 Werner Lemberg <wl(a)gnu.org>
+
+ * src/cff/cffload.c (cff_encoding_load): Remove unused variable.
+
+ * src/base/ftobjs.c (FT_Select_Charmap): Disallow FT_ENCODING_NONE
+ as argument.
+
+2006-10-23 Zhe Su <zsu(a)novell.com>
+
+ * src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to
+ better deal with broken Asian fonts with strange glyphs, having
+ self-intersections and other peculiarities. The used algorithm is
+ based on the nonzero winding rule.
+
+2006-10-23 David Turner <david(a)freetype.org>
+
+ Speed up the CFF font loader. With some large CFF fonts,
+ FT_Open_Face is now more than three times faster.
+
+ * src/cff/cffload.c (cff_get_offset): Removed.
+ (cff_new_index): Inline functionality of `cff_get_offset'.
+ (cff_charset_compute_cids, cff_charset_free_cids): New functions.
+ (cff_charset_done): Call `cff_charset_free_cids'.
+ (cff_charset_load): Call `cff_charset_compute_cids'.
+ (cff_encoding_load) <Populate>: Ditto, to replace inefficient loop.
+
+ * src/sfnt/ttmtx.c (tt_face_load_hmtx): Replace calls to FT_GET_XXX
+ with FT_NEXT_XXX.
+
+
+ Speed up the Postscript hinter, with more than 100% speed increase
+ on my machine.
+
+ * src/pshinter/pshalgo.c (psh_corner_is_flat,
+ psh_corner_orientation): New functions.
+ (psh_glyph_compute_inflections): Merge loops for efficiency.
+ Use `psh_corner_orientation'.
+ (psh_glyph_init): Use `psh_corner_is_flat'.
+ (psh_hint_table_find_strong_point): Renamed to...
+ (psh_hint_table_find_strong_points): This.
+ Rewrite, adding argument to handle all points at once.
+ Update all callers.
+ (PSH_MAX_STRONG_INTERNAL): New macro.
+ (psh_glyph_interpolate_normal_points): Rewrite for efficiency.
+
+2006-10-15 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp>
+
+ * src/base/ftmac.c (FT_New_Face_From_FOND): Initialize variable
+ `error' with FT_Err_Ok.
+
+2006-10-14 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp>
+
+ * docs/INSTALL.CROSS: New document file for cross-building.
+
+ * builds/unix/configure.raw: Preliminary cross-building support.
+ Find native C compiler and pass it by CC_BUILD, and
+ find suffix for native executable and pass it by EXEEXT_BUILD.
+ Also suffix for target executable is passed by EXEEXT.
+
+ * builds/unix/unix-cc.in (CCraw_build, E_BUILD): New variables to
+ build `apinames' which runs on building system. They are set by
+ CC_BUILD and EXEEXT_BUILD.
+
+ * builds/exports.mk (APINAMES_EXE): Change the extension for
+ apinames from the suffix for target (E) to that for building host
+ (E_BUILD).
+
2006-10-12 Werner Lemberg <wl(a)gnu.org>
* docs/INSTALL.UNX, docs/UPGRADE.UNX: Renamed to...
@@ -6,9 +73,9 @@
2006-10-12 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp>
- * builds/unix/configure.raw: Introduce new macro to embed optional
- dependency: FT2_EXTRA_LIBS, which is embedded in freetype2.pc and
- freetype-config. Use it to record Carbon dependency of MacOSX.
+ * builds/unix/configure.raw (FT2_EXTRA_LIBS): New variable. It is
+ embedded in freetype2.pc and freetype-config. Use it to record
+ Carbon dependency of MacOSX.
* builds/unix/freetype2.in: Embed FT2_EXTRA_LIBS.
@@ -43,7 +110,7 @@
auto-hinting shall be used or not.
* src/truetype/ttobjs.c (tt_face_init): Ditto.
-
+
2006-09-30 Werner Lemberg <wl(a)gnu.org>
* src/base/rules.mk (BASE_SRC): Remove `ftapi.c' (which is no longer
@@ -73,7 +140,7 @@
* include/freetype/freetype.h (FT_FREETYPE_PATCH): Set to 2.
- Add a new API to support color filtering of subpixel glyph bitmaps.
+ Add a new API to support color filtering of subpixel glyph bitmaps.
In a default build, the function `FT_Library_SetLcdFilter' returns
`FT_Err_Unimplemented_Feature'; you need to #define
FT_CONFIG_OPTION_SUBPIXEL_RENDERING in ftoption.h to compile the
@@ -88,6 +155,7 @@
* src/smooth/ftsmooth.c (ft_smooth_render_generic): Remove arguments
`hmul' and `vmul'.
+
Handle subpixel rendering.
Simplify function.
(ft_smooth_render_lcd): Use `FT_RENDER_MODE_LCD'.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/builds/exports.mk new/freetype-2.2.1.20061027/builds/exports.mk
--- old/freetype-2.2.1.20061013/builds/exports.mk 2006-04-03 17:46:48.000000000 +0200
+++ new/freetype-2.2.1.20061027/builds/exports.mk 2006-10-27 17:21:03.000000000 +0200
@@ -48,7 +48,7 @@
# Note that $(APINAMES_OPTIONS) is empty, except for Windows compilers.
#
APINAMES_SRC := $(TOP_DIR)/src/tools/apinames.c
- APINAMES_EXE := $(OBJ_DIR)/apinames$E
+ APINAMES_EXE := $(OBJ_DIR)/apinames$(E_BUILD)
$(APINAMES_EXE): $(APINAMES_SRC)
$(CCexe) $(TE)$@ $<
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/builds/unix/configure.raw new/freetype-2.2.1.20061027/builds/unix/configure.raw
--- old/freetype-2.2.1.20061013/builds/unix/configure.raw 2006-10-12 03:35:54.000000000 +0200
+++ new/freetype-2.2.1.20061027/builds/unix/configure.raw 2006-10-27 17:21:03.000000000 +0200
@@ -25,6 +25,8 @@
# checks for system type
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@@ -32,6 +34,42 @@
AC_PROG_CC
AC_PROG_CPP
+AC_SUBST(EXEEXT)
+
+
+# checks for native programs to generate building tool
+
+if test ${cross_compiling} = yes; then
+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
+ test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+ test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+ test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+
+ AC_MSG_CHECKING([for suffix of native executables])
+ rm -f a.* b.* a_out.exe conftest.*
+ echo > conftest.c "int main() { return 0;}"
+ ${CC_BUILD} conftest.c || AC_MSG_ERROR([native C compiler is not working])
+ rm -f conftest.c
+ if test -x a.out -o -x b.out -o -x conftest; then
+ EXEEXT_BUILD=""
+ elif test -x a_out.exe -o -x conftest.exe; then
+ EXEEXT_BUILD=".exe"
+ elif test -x conftest.* ; then
+ EXEEXT_BUILD=`echo conftest.* | sed -n '1s/^.*\.//g'`
+ fi
+ AC_MSG_RESULT($EXEEXT_BUILD)
+else
+ CC_BUILD=${CC}
+ EXEEXT_BUILD=${EXEEXT}
+fi
+
+
+if test ! -z ${EXEEXT_BUILD}; then
+ EXEEXT_BUILD=."${EXEEXT_BUILD}"
+fi
+AC_SUBST(CC_BUILD)
+AC_SUBST(EXEEXT_BUILD)
+
# get compiler flags right
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/builds/unix/unix-cc.in new/freetype-2.2.1.20061027/builds/unix/unix-cc.in
--- old/freetype-2.2.1.20061013/builds/unix/unix-cc.in 2006-05-26 08:30:05.000000000 +0200
+++ new/freetype-2.2.1.20061027/builds/unix/unix-cc.in 2006-10-27 17:21:03.000000000 +0200
@@ -25,6 +25,13 @@
SO := o
+# The executable file extension. Although most Unix platforms use no
+# extension, we copy the extension detected by autoconf. Useful for cross
+# building on Unix systems for non-Unix systems.
+#
+E := @EXEEXT@
+
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -88,10 +95,12 @@
LDFLAGS := @LDFLAGS@
-# export symbols (XXX: HOW TO DEAL WITH CROSS COMPILATION ?)
+# export symbols
#
+CCraw_build := @CC_BUILD@ # native CC of building system
+E_BUILD := @EXEEXT_BUILD@ # extension for exexutable on building system
EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
-CCexe := $(CCraw) # used to compile "apinames" only
+CCexe := $(CCraw_build) # used to compile `apinames' only
# Library linking
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/docs/INSTALL.CROSS new/freetype-2.2.1.20061027/docs/INSTALL.CROSS
--- old/freetype-2.2.1.20061013/docs/INSTALL.CROSS 1970-01-01 01:00:00.000000000 +0100
+++ new/freetype-2.2.1.20061027/docs/INSTALL.CROSS 2006-10-14 15:08:05.000000000 +0200
@@ -0,0 +1,135 @@
+This document contains instructions on how to cross-build the FreeType
+library on Unix systems, for example, building binaries for Linux/MIPS
+on FreeBSD/i386. Before reading this document, please consult
+INSTALL.UNIX for required tools and the basic self-building procedure.
+
+
+ 1. Required Tools
+ -----------------
+
+ For self-building the FreeType library on a Unix system, GNU Make
+ 3.78.1 or newer is required. INSTALL.UNIX contains hints how to
+ check the installed `make'.
+
+ The GNU C compiler to cross-build the target system is required.
+ At present, using non-GNU cross compiler is not tested. The cross
+ compiler is expected to be installed with a system prefix. For
+ example, if your building system is FreeBSD/i386 and the target
+ system is Linux/MIPS, the cross compiler should be installed with
+ the name `mips-ip22-linuxelf-gcc'.
+
+ A C compiler for a self-build is required also, to build a tool
+ that is executed during the building procedure. Non-GNU self
+ compilers are acceptable, but such a setup is not tested yet.
+
+
+ 2. Configuration
+ ----------------
+
+ 2.1. Building and target system
+
+ To configure for cross-build, the options `--host=<system>' and
+ `--build=<system>' must be passed to configure. For example, if
+ your building system is FreeBSD/i386 and the target system is
+ Linux/MIPS, say
+
+ ./configure \
+ --build=i386-unknown-freebsd \
+ --host=mips-ip22-linuxelf \
+ [other options]
+
+ It should be noted that `--host=<system>' specifies the system
+ where the built binaries will be executed, not the system where
+ the build actually happens. Older versions of GNU autoconf use
+ the option pair `--host=' and `--target='. This is broken and
+ doesn't work. Similarly, an explicit CC specification like
+
+ env CC=mips-ip22-linux-gcc ./configure
+
+ or
+
+ env CC=/usr/local/mips-ip22-linux/bin/gcc ./configure
+
+ doesn't work either; such a configuration confuses the
+ `configure' script while trying to find the cross and native C
+ compilers.
+
+
+ 2.2. The prefix to install FreeType2
+
+ Setting `--prefix=<prefix>' properly is important. The prefix
+ to install FreeType2 is written into the freetype-config script
+ and freetype2.pc configuration file.
+
+ If the built FreeType 2 library is used as a part of the
+ cross-building system, the prefix is expected to be different
+ from the self-building system. For example, configuration with
+ `--prefix=/usr/local' installs binaries into the system wide
+ `/usr/local' directory which then can't be executed. This
+ causes confusion in configuration of all applications which use
+ FreeType2. Instead, use a prefix to install the cross-build
+ into a separate system tree, for example,
+ `--prefix=/usr/local/mips-ip22-linux/'.
+
+ On the other hand, if the built FreeType2 is used as a part of
+ the target system, the prefix to install should reflect the file
+ system structure of the target system.
+
+
+ 3. Building command
+ -------------------
+
+ If the configuration finishes successfuly, invoking GNU make builds
+ FreeType2. Just say
+
+ make
+
+ or
+
+ gmake
+
+ depending on the name the GNU make binary actually has.
+
+
+ 4. Installation
+ ---------------
+
+ Saying
+
+ make install
+
+ as usual to install FreeType2 into the directory tree specified by
+ the argument of the `--prefix' option.
+
+ As noted in section 2.2, FreeType2 is sometimes configured to be
+ installed into the system directory of the target system, and
+ should not be installed in the cross-building system. In such
+ cases, the make variable `DESTDIR' is useful to change the root
+ directory in the installation. For example, after
+
+ make DESTDIR=/mnt/target_system_root/ install
+
+ the built FreeType2 library files are installed into the directory
+ `/mnt/target_system_root/<prefix_in_configure>/lib'.
+
+
+ 5. TODO
+ -------
+
+ Cross building between Cygwin (or MSys) and Unix must be tested.
+
+
+----------------------------------------------------------------------
+
+Copyright 2006 by suzuki toshiya
+David Turner, Robert Wilhelm, and Werner Lemberg.
+
+
+This file is part of the FreeType project, and may only be used,
+modified, and distributed under the terms of the FreeType project
+license, LICENSE.TXT. By continuing to use, modify, or distribute
+this file you indicate that you have read the license and understand
+and accept it fully.
+
+
+--- end of INSTALL.CROSS ---
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/base/ftmac.c new/freetype-2.2.1.20061027/src/base/ftmac.c
--- old/freetype-2.2.1.20061013/src/base/ftmac.c 2006-09-19 07:48:02.000000000 +0200
+++ new/freetype-2.2.1.20061027/src/base/ftmac.c 2006-10-27 17:21:04.000000000 +0200
@@ -1165,7 +1165,7 @@
Str255 lwfn_file_name;
UInt8 path_lwfn[HFS_MAXPATHLEN];
OSErr err;
- FT_Error error;
+ FT_Error error = FT_Err_Ok;
GetResInfo( fond, &fond_id, &fond_type, fond_name );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/base/ftobjs.c new/freetype-2.2.1.20061027/src/base/ftobjs.c
--- old/freetype-2.2.1.20061013/src/base/ftobjs.c 2006-10-03 10:43:42.000000000 +0200
+++ new/freetype-2.2.1.20061027/src/base/ftobjs.c 2006-10-27 17:21:04.000000000 +0200
@@ -2574,6 +2574,9 @@
if ( !face )
return FT_Err_Invalid_Face_Handle;
+ if ( encoding == FT_ENCODING_NONE )
+ return FT_Err_Invalid_Argument;
+
/* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
/* charmap available, i.e., one with UCS-4 characters, if possible. */
/* */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/base/ftoutln.c new/freetype-2.2.1.20061027/src/base/ftoutln.c
--- old/freetype-2.2.1.20061013/src/base/ftoutln.c 2006-05-18 00:55:04.000000000 +0200
+++ new/freetype-2.2.1.20061027/src/base/ftoutln.c 2006-10-27 17:21:04.000000000 +0200
@@ -934,7 +934,8 @@
FT_Outline_Get_Orientation( FT_Outline* outline )
{
FT_Pos xmin = 32768L;
- FT_Vector* xmin_point = NULL;
+ FT_Pos xmin_ymin = 32768L;
+ FT_Pos xmin_ymax = -32768L;
FT_Vector* xmin_first = NULL;
FT_Vector* xmin_last = NULL;
@@ -943,22 +944,31 @@
FT_Vector* first;
FT_Vector* last;
FT_Vector* prev;
- FT_Vector* next;
+ FT_Vector* point;
+
+ int i;
+ FT_Pos ray_y[3];
+ int result[3];
if ( !outline || outline->n_points <= 0 )
return FT_ORIENTATION_TRUETYPE;
+ /* We use the nonzero winding rule to find the orientation. */
+ /* Since glyph outlines behave much more `regular' than arbitrary */
+ /* cubic or quadratic curves, this test deals with the polygon */
+ /* only which is spanned up by the control points. */
+
first = outline->points;
for ( contour = outline->contours;
contour < outline->contours + outline->n_contours;
contour++, first = last + 1 )
{
- FT_Vector* point;
- FT_Int on_curve;
- FT_Int on_curve_count = 0;
- FT_Pos tmp_xmin = 32768L;
- FT_Vector* tmp_xmin_point = NULL;
+ FT_Pos contour_xmin = 32768L;
+ FT_Pos contour_xmax = -32768L;
+ FT_Pos contour_ymin = 32768L;
+ FT_Pos contour_ymax = -32768L;
+
last = outline->points + *contour;
@@ -968,74 +978,108 @@
for ( point = first; point <= last; ++point )
{
- /* Count on-curve points. If there are less than 3 on-curve */
- /* points, just bypass this contour. */
- on_curve = outline->tags[point - outline->points] & 1;
- on_curve_count += on_curve;
+ if ( point->x < contour_xmin )
+ contour_xmin = point->x;
- if ( point->x < tmp_xmin && on_curve )
- {
- tmp_xmin = point->x;
- tmp_xmin_point = point;
- }
+ if ( point->x > contour_xmax )
+ contour_xmax = point->x;
+
+ if ( point->y < contour_ymin )
+ contour_ymin = point->y;
+
+ if ( point->y > contour_ymax )
+ contour_ymax = point->y;
}
- if ( on_curve_count > 2 && tmp_xmin < xmin )
+ if ( contour_xmin < xmin &&
+ contour_xmin != contour_xmax &&
+ contour_ymin != contour_ymax )
{
- xmin = tmp_xmin;
- xmin_point = tmp_xmin_point;
+ xmin = contour_xmin;
+ xmin_ymin = contour_ymin;
+ xmin_ymax = contour_ymax;
xmin_first = first;
xmin_last = last;
}
}
- if ( !xmin_point )
+ if ( xmin == 32768 )
return FT_ORIENTATION_TRUETYPE;
- prev = ( xmin_point == xmin_first ) ? xmin_last : xmin_point - 1;
- next = ( xmin_point == xmin_last ) ? xmin_first : xmin_point + 1;
+ ray_y[0] = ( xmin_ymin * 3 + xmin_ymax ) >> 2;
+ ray_y[1] = ( xmin_ymin + xmin_ymax ) >> 1;
+ ray_y[2] = ( xmin_ymin + xmin_ymax * 3 ) >> 2;
- /* Skip off-curve points */
- while ( ( outline->tags[prev - outline->points] & 1 ) == 0 )
+ for ( i = 0; i < 3; i++ )
{
- if ( prev == xmin_first )
- prev = xmin_last;
- else
- --prev;
- }
+ FT_Pos left_x;
+ FT_Pos right_x;
+ FT_Vector* left1;
+ FT_Vector* left2;
+ FT_Vector* right1;
+ FT_Vector* right2;
+
+
+ RedoRay:
+ left_x = 32768L;
+ right_x = -32768L;
- while ( ( outline->tags[next - outline->points] & 1 ) == 0 )
- {
- if ( next == xmin_last )
- next = xmin_first;
- else
- ++next;
- }
+ left1 = left2 = right1 = right2 = NULL;
-#if 1
+ prev = xmin_last;
+ for ( point = xmin_first; point <= xmin_last; prev = point, ++point )
+ {
+ FT_Pos tmp_x;
- {
- FT_Pos dx1 = prev->x - xmin_point->x;
- FT_Pos dy1 = prev->y - xmin_point->y;
- FT_Pos dx2 = next->x - xmin_point->x;
- FT_Pos dy2 = next->y - xmin_point->y;
+ if ( point->y == ray_y[i] || prev->y == ray_y[i] )
+ {
+ ray_y[i]++;
+ goto RedoRay;
+ }
+
+ if ( ( point->y < ray_y[i] && prev->y < ray_y[i] ) ||
+ ( point->y > ray_y[i] && prev->y > ray_y[i] ) )
+ continue;
+
+ tmp_x = FT_MulDiv( point->x - prev->x,
+ ray_y[i] - prev->y,
+ point->y - prev->y ) + prev->x;
+
+ if ( tmp_x < left_x )
+ {
+ left_x = tmp_x;
+ left1 = prev;
+ left2 = point;
+ }
+
+ if ( tmp_x > right_x )
+ {
+ right_x = tmp_x;
+ right1 = prev;
+ right2 = point;
+ }
+ }
- if ( dy1 * dx2 > dy2 * dx1 )
- return FT_ORIENTATION_POSTSCRIPT;
- else
- return FT_ORIENTATION_TRUETYPE;
+ if ( left1 && right1 )
+ {
+ if ( left1->y < left2->y && right1->y > right2->y )
+ result[i] = FT_ORIENTATION_TRUETYPE;
+ else if ( left1->y > left2->y && right1->y < right2->y )
+ result[i] = FT_ORIENTATION_POSTSCRIPT;
+ else
+ result[i] = FT_ORIENTATION_NONE;
+ }
}
-#else /* 0 */
+ if ( result[0] != FT_ORIENTATION_NONE &&
+ ( result[0] == result[1] || result[0] == result[2] ) )
+ return result[0];
- if ( FT_Atan2( prev->x - xmin_point->x, prev->y - xmin_point->y ) >
- FT_Atan2( next->x - xmin_point->x, next->y - xmin_point->y ) )
- return FT_ORIENTATION_POSTSCRIPT;
- else
- return FT_ORIENTATION_TRUETYPE;
+ if ( result[1] != FT_ORIENTATION_NONE && result[1] == result[2] )
+ return result[1];
-#endif /* 0 */
+ return FT_ORIENTATION_TRUETYPE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/cff/cffload.c new/freetype-2.2.1.20061027/src/cff/cffload.c
--- old/freetype-2.2.1.20061013/src/cff/cffload.c 2006-05-17 10:54:30.000000000 +0200
+++ new/freetype-2.2.1.20061027/src/cff/cffload.c 2006-10-27 17:21:04.000000000 +0200
@@ -1063,24 +1063,6 @@
#define FT_COMPONENT trace_cffload
- /* read a CFF offset from memory */
- static FT_ULong
- cff_get_offset( FT_Byte* p,
- FT_Byte off_size )
- {
- FT_ULong result;
-
-
- for ( result = 0; off_size > 0; off_size-- )
- {
- result <<= 8;
- result |= *p++;
- }
-
- return result;
- }
-
-
static FT_Error
cff_new_index( CFF_Index idx,
FT_Stream stream,
@@ -1101,6 +1083,7 @@
FT_Byte offsize;
FT_ULong data_size;
FT_ULong* poff;
+ FT_Byte* p_end;
/* there is at least one element; read the offset size, */
@@ -1108,6 +1091,12 @@
if ( FT_READ_BYTE( offsize ) )
goto Exit;
+ if ( offsize < 1 || offsize > 4 )
+ {
+ error = FT_Err_Invalid_Table;
+ goto Exit;
+ }
+
idx->stream = stream;
idx->count = count;
idx->off_size = offsize;
@@ -1117,14 +1106,30 @@
FT_FRAME_ENTER( data_size ) )
goto Exit;
- poff = idx->offsets;
- p = (FT_Byte*)stream->cursor;
+ poff = idx->offsets;
+ p = (FT_Byte*)stream->cursor;
+ p_end = p + data_size;
- for ( ; (FT_Short)count >= 0; count-- )
+ switch ( offsize )
{
- poff[0] = cff_get_offset( p, offsize );
- poff++;
- p += offsize;
+ case 1:
+ for ( ; p < p_end; p++, poff++ )
+ poff[0] = p[0];
+ break;
+
+ case 2:
+ for ( ; p < p_end; p += 2, poff++ )
+ poff[0] = FT_PEEK_USHORT( p );
+ break;
+
+ case 3:
+ for ( ; p < p_end; p += 3, poff++ )
+ poff[0] = FT_PEEK_OFF3( p );
+ break;
+
+ default:
+ for ( ; p < p_end; p += 4, poff++ )
+ poff[0] = FT_PEEK_ULONG( p );
}
FT_FRAME_EXIT();
@@ -1493,6 +1498,46 @@
/*************************************************************************/
/*************************************************************************/
+ static FT_Error
+ cff_charset_compute_cids( CFF_Charset charset,
+ FT_UInt num_glyphs,
+ FT_Memory memory )
+ {
+ FT_Error error = FT_Err_Ok;
+ FT_UInt i;
+ FT_UShort max_cid = 0;
+
+
+ if ( charset->max_cid > 0 )
+ goto Exit;
+
+ for ( i = 0; i < num_glyphs; i++ )
+ if ( charset->sids[i] > max_cid )
+ max_cid = charset->sids[i];
+ max_cid++;
+
+ if ( FT_NEW_ARRAY( charset->cids, max_cid ) )
+ goto Exit;
+
+ for ( i = 0; i < num_glyphs; i++ )
+ charset->cids[charset->sids[i]] = (FT_UShort)i;
+
+ charset->max_cid = max_cid;
+
+ Exit:
+ return error;
+ }
+
+
+ static void
+ cff_charset_free_cids( CFF_Charset charset,
+ FT_Memory memory )
+ {
+ FT_FREE( charset->cids );
+ charset->max_cid = 0;
+ }
+
+
static void
cff_charset_done( CFF_Charset charset,
FT_Stream stream )
@@ -1500,8 +1545,9 @@
FT_Memory memory = stream->memory;
+ cff_charset_free_cids( charset, memory );
+
FT_FREE( charset->sids );
- FT_FREE( charset->cids );
charset->format = 0;
charset->offset = 0;
}
@@ -1672,25 +1718,7 @@
/* we have to invert the `sids' array for subsetted CID-keyed fonts */
if ( invert )
- {
- FT_UInt i;
- FT_UShort max_cid = 0;
-
-
- for ( i = 0; i < num_glyphs; i++ )
- if ( charset->sids[i] > max_cid )
- max_cid = charset->sids[i];
- max_cid++;
-
- if ( FT_NEW_ARRAY( charset->cids, max_cid ) )
- goto Exit;
- FT_MEM_ZERO( charset->cids, sizeof ( FT_UShort ) * max_cid );
-
- for ( i = 0; i < num_glyphs; i++ )
- charset->cids[charset->sids[i]] = (FT_UShort)i;
-
- charset->max_cid = max_cid;
- }
+ error = cff_charset_compute_cids( charset, num_glyphs, memory );
Exit:
/* Clean up if there was an error. */
@@ -1896,9 +1924,6 @@
}
else
{
- FT_UInt i;
-
-
/* We take into account the fact a CFF font can use a predefined */
/* encoding without containing all of the glyphs encoded by this */
/* encoding (see the note at the end of section 12 in the CFF */
@@ -1921,32 +1946,30 @@
encoding->count = 0;
+ error = cff_charset_compute_cids( charset, num_glyphs, stream->memory );
+ if ( error )
+ goto Exit;
+
for ( j = 0; j < 256; j++ )
{
- /* If j is encoded, find the GID for it. */
- if ( encoding->sids[j] )
+ FT_UInt sid = encoding->sids[j];
+ FT_UInt gid = 0;
+
+
+ if ( sid )
+ gid = charset->cids[sid];
+
+ if ( gid != 0 )
{
- for ( i = 1; i < num_glyphs; i++ )
- /* We matched, so break. */
- if ( charset->sids[i] == encoding->sids[j] )
- break;
-
- /* i will be equal to num_glyphs if we exited the above */
- /* loop without a match. In this case, we also have to */
- /* fix the code to SID mapping. */
- if ( i == num_glyphs )
- {
- encoding->codes[j] = 0;
- encoding->sids [j] = 0;
- }
- else
- {
- encoding->codes[j] = (FT_UShort)i;
+ encoding->codes[j] = (FT_UShort)gid;
- /* update encoding count */
- if ( encoding->count < j + 1 )
- encoding->count = j + 1;
- }
+ if ( encoding->count < j + 1 )
+ encoding->count = j + 1;
+ }
+ else
+ {
+ encoding->codes[j] = 0;
+ encoding->sids [j] = 0;
}
}
break;
@@ -2013,7 +2036,7 @@
if ( error )
goto Exit;
-
+
/* if it is a CID font, we stop there */
if ( top->cid_registry != 0xFFFFU )
goto Exit;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/pshinter/pshalgo.c new/freetype-2.2.1.20061027/src/pshinter/pshalgo.c
--- old/freetype-2.2.1.20061013/src/pshinter/pshalgo.c 2005-04-09 11:50:39.000000000 +0200
+++ new/freetype-2.2.1.20061027/src/pshinter/pshalgo.c 2006-10-27 17:21:04.000000000 +0200
@@ -4,7 +4,7 @@
/* */
/* PostScript hinting algorithm (body). */
/* */
-/* Copyright 2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -879,8 +879,98 @@
/*************************************************************************/
/*************************************************************************/
+ FT_LOCAL_DEF( FT_Int )
+ psh_corner_is_flat( FT_Pos x_in,
+ FT_Pos y_in,
+ FT_Pos x_out,
+ FT_Pos y_out )
+ {
+ FT_Pos ax = x_in;
+ FT_Pos ay = y_in;
+
+ FT_Pos d_in, d_out, d_corner;
+
+
+ if ( ax < 0 )
+ ax = -ax;
+ if ( ay < 0 )
+ ay = -ay;
+ d_in = ax + ay;
+
+ ax = x_out;
+ if ( ax < 0 )
+ ax = -ax;
+ ay = y_out;
+ if ( ay < 0 )
+ ay = -ay;
+ d_out = ax + ay;
+
+ ax = x_out + x_in;
+ if ( ax < 0 )
+ ax = -ax;
+ ay = y_out + y_in;
+ if ( ay < 0 )
+ ay = -ay;
+ d_corner = ax + ay;
+
+ return ( d_in + d_out - d_corner ) < ( d_corner >> 4 );
+ }
+
+
#ifdef COMPUTE_INFLEXS
+ static FT_Int
+ psh_corner_orientation( FT_Pos in_x,
+ FT_Pos in_y,
+ FT_Pos out_x,
+ FT_Pos out_y )
+ {
+ FT_Int result;
+
+
+ /* deal with the trivial cases quickly */
+ if ( in_y == 0 )
+ {
+ if ( in_x >= 0 )
+ result = out_y;
+ else
+ result = -out_y;
+ }
+ else if ( in_x == 0 )
+ {
+ if ( in_y >= 0 )
+ result = -out_x;
+ else
+ result = out_x;
+ }
+ else if ( out_y == 0 )
+ {
+ if ( out_x >= 0 )
+ result = in_y;
+ else
+ result = -in_y;
+ }
+ else if ( out_x == 0 )
+ {
+ if ( out_y >= 0 )
+ result = -in_x;
+ else
+ result = in_x;
+ }
+ else /* general case */
+ {
+ long long delta = (long long)in_x * out_y - (long long)in_y * out_x;
+
+ if ( delta == 0 )
+ result = 0;
+ else
+ result = 1 - 2 * ( delta < 0 );
+ }
+
+ return result;
+ }
+
+
/* compute all inflex points in a given glyph */
static void
psh_glyph_compute_inflections( PSH_Glyph glyph )
@@ -891,8 +981,8 @@
for ( n = 0; n < glyph->num_contours; n++ )
{
PSH_Point first, start, end, before, after;
- FT_Angle angle_in, angle_seg, angle_out;
- FT_Angle diff_in, diff_out;
+ FT_Pos in_x, in_y, out_x, out_y;
+ FT_Int orient_prev, orient_cur;
FT_Int finished = 0;
@@ -910,9 +1000,10 @@
if ( end == first )
goto Skip;
- } while ( PSH_POINT_EQUAL_ORG( end, first ) );
+ in_x = end->org_u - start->org_u;
+ in_y = end->org_v - start->org_v;
- angle_seg = PSH_POINT_ANGLE( start, end );
+ } while ( in_x == 0 && out_x == 0 );
/* extend the segment start whenever possible */
before = start;
@@ -925,14 +1016,18 @@
if ( before == first )
goto Skip;
- } while ( PSH_POINT_EQUAL_ORG( before, start ) );
+ out_x = start->org_u - before->org_u;
+ out_y = start->org_v - before->org_v;
- angle_in = PSH_POINT_ANGLE( before, start );
+ } while ( out_x == 0 && out_y == 0 );
- } while ( angle_in == angle_seg );
+ orient_prev = psh_corner_orientation( in_x, in_y, out_x, out_y );
- first = start;
- diff_in = FT_Angle_Diff( angle_in, angle_seg );
+ } while ( orient_prev != 0 );
+
+ first = start;
+ in_x = out_x;
+ in_y = out_y;
/* now, process all segments in the contour */
do
@@ -948,19 +1043,17 @@
if ( after == first )
finished = 1;
- } while ( PSH_POINT_EQUAL_ORG( end, after ) );
+ out_x = after->org_u - end->org_u;
+ out_y = after->org_v - end->org_v;
- angle_out = PSH_POINT_ANGLE( end, after );
+ } while ( out_x == 0 && out_y == 0 );
- } while ( angle_out == angle_seg );
+ orient_cur = psh_corner_orientation( in_x, in_y, out_x, out_y );
- diff_out = FT_Angle_Diff( angle_seg, angle_out );
+ } while ( orient_cur == 0 );
- if ( ( diff_in ^ diff_out ) < 0 )
+ if ( ( orient_cur ^ orient_prev ) < 0 )
{
- /* diff_in and diff_out have different signs, we have */
- /* inflection points here... */
-
do
{
psh_point_set_inflex( start );
@@ -971,10 +1064,11 @@
psh_point_set_inflex( start );
}
- start = end;
- end = after;
- angle_seg = angle_out;
- diff_in = diff_out;
+ start = end;
+ end = after;
+ orient_prev = orient_cur;
+ in_x = out_x;
+ in_y = out_y;
} while ( !finished );
@@ -1199,28 +1293,11 @@
/* detect smooth points */
if ( point->flags & PSH_POINT_OFF )
point->flags |= PSH_POINT_SMOOTH;
- else if ( point->dir_in != PSH_DIR_NONE ||
- point->dir_out != PSH_DIR_NONE )
- {
- if ( point->dir_in == point->dir_out )
- point->flags |= PSH_POINT_SMOOTH;
- }
- else
- {
- FT_Angle angle_in, angle_out, diff;
-
- angle_in = FT_Atan2( dxi, dyi );
- angle_out = FT_Atan2( dxo, dyo );
-
- diff = angle_in - angle_out;
- if ( diff < 0 )
- diff = -diff;
-
- if ( diff > FT_ANGLE_PI )
- diff = FT_ANGLE_2PI - diff;
-
- if ( diff < FT_ANGLE_PI / 16 )
+ else if ( point->dir_in == point->dir_out )
+ {
+ if ( point->dir_out != PSH_DIR_NONE ||
+ psh_corner_is_flat( dxi, dyi, dxo, dyo ) )
point->flags |= PSH_POINT_SMOOTH;
}
}
@@ -1382,115 +1459,147 @@
/* -major_dir. */
static void
- psh_hint_table_find_strong_point( PSH_Hint_Table table,
- PSH_Point point,
- FT_Int threshold,
- FT_Int major_dir )
+ psh_hint_table_find_strong_points( PSH_Hint_Table table,
+ PSH_Point point,
+ FT_UInt count,
+ FT_Int threshold,
+ FT_Int major_dir )
{
PSH_Hint* sort = table->sort;
FT_UInt num_hints = table->num_hints;
- FT_Int point_dir = 0;
- if ( PSH_DIR_COMPARE( point->dir_in, major_dir ) )
- point_dir = point->dir_in;
-
- else if ( PSH_DIR_COMPARE( point->dir_out, major_dir ) )
- point_dir = point->dir_out;
-
- if ( point_dir )
+ for ( ; count > 0; count--, point++ )
{
- FT_UInt flag;
+ FT_Int point_dir = 0;
+ FT_Pos org_u = point->org_u;
- for ( ; num_hints > 0; num_hints--, sort++ )
- {
- PSH_Hint hint = sort[0];
- FT_Pos d;
+ if ( psh_point_is_strong( point ) )
+ continue;
+
+ if ( PSH_DIR_COMPARE( point->dir_in, major_dir ) )
+ point_dir = point->dir_in;
+ else if ( PSH_DIR_COMPARE( point->dir_out, major_dir ) )
+ point_dir = point->dir_out;
+ if ( point_dir )
+ {
if ( point_dir == major_dir )
{
- flag = PSH_POINT_EDGE_MIN;
- d = point->org_u - hint->org_pos;
+ FT_UInt nn;
- if ( FT_ABS( d ) < threshold )
+
+ for ( nn = 0; nn < num_hints; nn++ )
{
- Is_Strong:
- psh_point_set_strong( point );
- point->flags2 |= flag;
- point->hint = hint;
- break;
+ PSH_Hint hint = sort[nn];
+ FT_Pos d = org_u - hint->org_pos;
+
+
+ if ( d < threshold && -d < threshold )
+ {
+ psh_point_set_strong( point );
+ point->flags2 |= PSH_POINT_EDGE_MIN;
+ point->hint = hint;
+ break;
+ }
}
}
else if ( point_dir == -major_dir )
{
- flag = PSH_POINT_EDGE_MAX;
- d = point->org_u - hint->org_pos - hint->org_len;
+ FT_UInt nn;
- if ( FT_ABS( d ) < threshold )
- goto Is_Strong;
- }
- }
- }
-#if 1
- else if ( psh_point_is_extremum( point ) )
- {
- /* treat extrema as special cases for stem edge alignment */
- FT_UInt min_flag, max_flag;
+ for ( nn = 0; nn < num_hints; nn++ )
+ {
+ PSH_Hint hint = sort[nn];
+ FT_Pos d = org_u - hint->org_pos - hint->org_len;
- if ( major_dir == PSH_DIR_HORIZONTAL )
- {
- min_flag = PSH_POINT_POSITIVE;
- max_flag = PSH_POINT_NEGATIVE;
- }
- else
- {
- min_flag = PSH_POINT_NEGATIVE;
- max_flag = PSH_POINT_POSITIVE;
+ if ( d < threshold && -d < threshold )
+ {
+ psh_point_set_strong( point );
+ point->flags2 |= PSH_POINT_EDGE_MAX;
+ point->hint = hint;
+ break;
+ }
+ }
+ }
}
- for ( ; num_hints > 0; num_hints--, sort++ )
+#if 1
+ else if ( psh_point_is_extremum( point ) )
{
- PSH_Hint hint = sort[0];
- FT_Pos d;
- FT_Int flag;
+ /* treat extrema as special cases for stem edge alignment */
+ FT_UInt nn, min_flag, max_flag;
- if ( point->flags2 & min_flag )
+ if ( major_dir == PSH_DIR_HORIZONTAL )
{
- flag = PSH_POINT_EDGE_MIN;
- d = point->org_u - hint->org_pos;
+ min_flag = PSH_POINT_POSITIVE;
+ max_flag = PSH_POINT_NEGATIVE;
+ }
+ else
+ {
+ min_flag = PSH_POINT_NEGATIVE;
+ max_flag = PSH_POINT_POSITIVE;
+ }
- if ( FT_ABS( d ) < threshold )
+ if ( point->flags2 & min_flag )
+ {
+ for ( nn = 0; nn < num_hints; nn++ )
{
- Is_Strong2:
- point->flags2 |= flag;
- point->hint = hint;
- psh_point_set_strong( point );
- break;
+ PSH_Hint hint = sort[nn];
+ FT_Pos d = org_u - hint->org_pos;
+
+
+ if ( d < threshold && -d < threshold )
+ {
+ point->flags2 |= PSH_POINT_EDGE_MIN;
+ point->hint = hint;
+ psh_point_set_strong( point );
+ break;
+ }
}
}
else if ( point->flags2 & max_flag )
{
- flag = PSH_POINT_EDGE_MAX;
- d = point->org_u - hint->org_pos - hint->org_len;
+ for ( nn = 0; nn < num_hints; nn++ )
+ {
+ PSH_Hint hint = sort[nn];
+ FT_Pos d = org_u - hint->org_pos - hint->org_len;
+
- if ( FT_ABS( d ) < threshold )
- goto Is_Strong2;
+ if ( d < threshold && -d < threshold )
+ {
+ point->flags2 |= PSH_POINT_EDGE_MAX;
+ point->hint = hint;
+ psh_point_set_strong( point );
+ break;
+ }
+ }
}
- if ( point->org_u >= hint->org_pos &&
- point->org_u <= hint->org_pos + hint->org_len )
+ if ( point->hint == NULL )
{
- point->hint = hint;
+ for ( nn = 0; nn < num_hints; nn++ )
+ {
+ PSH_Hint hint = sort[nn];
+
+
+ if ( org_u >= hint->org_pos &&
+ org_u <= hint->org_pos + hint->org_len )
+ {
+ point->hint = hint;
+ break;
+ }
+ }
}
}
- }
#endif /* 1 */
+ }
}
@@ -1544,9 +1653,8 @@
psh_hint_table_activate_mask( table, mask );
- for ( ; count > 0; count--, point++ )
- psh_hint_table_find_strong_point( table, point,
- threshold, major_dir );
+ psh_hint_table_find_strong_points( table, point, count,
+ threshold, major_dir );
}
first = next;
}
@@ -1560,12 +1668,9 @@
psh_hint_table_activate_mask( table, table->hint_masks->masks );
- for ( ; count > 0; count--, point++ )
- {
- if ( !psh_point_is_strong( point ) )
- psh_hint_table_find_strong_point( table, point,
- threshold, major_dir );
- }
+
+ psh_hint_table_find_strong_points( table, point, count,
+ threshold, major_dir );
}
/* now, certain points may have been attached to a hint and */
@@ -1710,6 +1815,8 @@
}
+#define PSH_MAX_STRONG_INTERNAL 16
+
static void
psh_glyph_interpolate_normal_points( PSH_Glyph glyph,
FT_Int dimension )
@@ -1718,14 +1825,64 @@
#if 1
/* first technique: a point is strong if it is a local extremum */
- PSH_Dimension dim = &glyph->globals->dimension[dimension];
- FT_Fixed scale = dim->scale_mult;
+ PSH_Dimension dim = &glyph->globals->dimension[dimension];
+ FT_Fixed scale = dim->scale_mult;
+ FT_Memory memory = glyph->memory;
- FT_UInt count = glyph->num_points;
- PSH_Point point = glyph->points;
+ PSH_Point* strongs = NULL;
+ PSH_Point strongs_0[PSH_MAX_STRONG_INTERNAL];
+ FT_UInt num_strongs = 0;
+ PSH_Point points = glyph->points;
+ PSH_Point points_end = points + glyph->num_points;
+ PSH_Point point;
- for ( ; count > 0; count--, point++ )
+
+ /* first count the number of strong points */
+ for ( point = points; point < points_end; point++ )
+ {
+ if ( psh_point_is_strong( point ) )
+ num_strongs++;
+ }
+
+ if ( num_strongs == 0 ) /* nothing to do here */
+ return;
+
+ /* allocate an array to store a list of points, */
+ /* stored in increasing org_u order */
+ if ( num_strongs <= PSH_MAX_STRONG_INTERNAL )
+ strongs = strongs_0;
+ else
+ {
+ FT_Error error;
+
+
+ if ( !FT_NEW_ARRAY( strongs, num_strongs ) )
+ return;
+ }
+
+ num_strongs = 0;
+ for ( point = points; point < points_end; point++ )
+ {
+ PSH_Point* insert;
+
+
+ if ( !psh_point_is_strong( point ) )
+ continue;
+
+ for ( insert = strongs + num_strongs; insert > strongs; insert-- )
+ {
+ if ( insert[-1]->org_u <= point->org_u )
+ break;
+
+ insert[0] = insert[-1];
+ }
+ insert[0] = point;
+ num_strongs++;
+ }
+
+ /* now try to interpolate all normal points */
+ for ( point = points; point < points_end; point++ )
{
if ( psh_point_is_strong( point ) )
continue;
@@ -1744,82 +1901,70 @@
point->flags &= ~PSH_POINT_SMOOTH;
}
- /* find best enclosing point coordinates */
+ /* find best enclosing point coordinates then interpolate */
{
- PSH_Point before = 0;
- PSH_Point after = 0;
+ PSH_Point before, after;
+ FT_UInt nn;
- FT_Pos diff_before = -32000;
- FT_Pos diff_after = 32000;
- FT_Pos u = point->org_u;
- FT_Int count2 = glyph->num_points;
- PSH_Point cur = glyph->points;
+ for ( nn = 0; nn < num_strongs; nn++ )
+ if ( strongs[nn]->org_u > point->org_u )
+ break;
+ if ( nn == 0 ) /* point before the first strong point */
+ {
+ after = strongs[0];
- for ( ; count2 > 0; count2--, cur++ )
+ point->cur_u = after->cur_u +
+ FT_MulFix( point->org_u - after->org_u,
+ scale );
+ }
+ else
{
- if ( psh_point_is_strong( cur ) )
- {
- FT_Pos diff = cur->org_u - u;
+ before = strongs[nn - 1];
+ for ( nn = num_strongs; nn > 0; nn-- )
+ if ( strongs[nn - 1]->org_u < point->org_u )
+ break;
- if ( diff <= 0 )
- {
- if ( diff > diff_before )
- {
- diff_before = diff;
- before = cur;
- }
- }
+ if ( nn == num_strongs ) /* point is after last strong point */
+ {
+ before = strongs[nn - 1];
- else if ( diff >= 0 )
- {
- if ( diff < diff_after )
- {
- diff_after = diff;
- after = cur;
- }
- }
+ point->cur_u = before->cur_u +
+ FT_MulFix( point->org_u - before->org_u,
+ scale );
}
- }
+ else
+ {
+ FT_Pos u;
- if ( !before )
- {
- if ( !after )
- continue;
- /* we are before the first strong point coordinate; */
- /* simply translate the point */
- point->cur_u = after->cur_u +
- FT_MulFix( point->org_u - after->org_u, scale );
- }
- else if ( !after )
- {
- /* we are after the last strong point coordinate; */
- /* simply translate the point */
- point->cur_u = before->cur_u +
- FT_MulFix( point->org_u - before->org_u, scale );
- }
- else
- {
- if ( diff_before == 0 )
- point->cur_u = before->cur_u;
+ after = strongs[nn];
- else if ( diff_after == 0 )
- point->cur_u = after->cur_u;
+ /* now interpolate point between before and after */
+ u = point->org_u;
- else
- point->cur_u = before->cur_u +
- FT_MulDiv( u - before->org_u,
- after->cur_u - before->cur_u,
- after->org_u - before->org_u );
- }
+ if ( u == before->org_u )
+ point->cur_u = before->cur_u;
+ else if ( u == after->org_u )
+ point->cur_u = after->cur_u;
+
+ else
+ point->cur_u = before->cur_u +
+ FT_MulDiv( u - before->org_u,
+ after->cur_u - before->cur_u,
+ after->org_u - before->org_u );
+ }
+ }
psh_point_set_fitted( point );
}
}
+ if ( strongs != strongs_0 )
+ FT_FREE( strongs );
+
#endif /* 1 */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/freetype-2.2.1.20061013/src/sfnt/ttmtx.c new/freetype-2.2.1.20061027/src/sfnt/ttmtx.c
--- old/freetype-2.2.1.20061013/src/sfnt/ttmtx.c 2006-03-20 14:32:33.000000000 +0100
+++ new/freetype-2.2.1.20061027/src/sfnt/ttmtx.c 2006-10-27 17:21:04.000000000 +0200
@@ -71,8 +71,8 @@
FT_ULong table_size;
FT_Byte** ptable;
FT_ULong* ptable_size;
-
-
+
+
if ( vertical )
{
error = face->goto_table( face, TTAG_vmtx, stream, &table_size );
@@ -91,10 +91,10 @@
ptable = &face->horz_metrics;
ptable_size = &face->horz_metrics_size;
}
-
+
if ( FT_FRAME_EXTRACT( table_size, *ptable ) )
goto Fail;
-
+
*ptable_size = table_size;
Fail:
@@ -116,6 +116,7 @@
TT_LongMetrics * longs;
TT_ShortMetrics** shorts;
+ FT_Byte* p;
if ( vertical )
@@ -175,6 +176,8 @@
if ( FT_FRAME_ENTER( table_len ) )
goto Fail;
+ p = stream->cursor;
+
{
TT_LongMetrics cur = *longs;
TT_LongMetrics limit = cur + num_longs;
@@ -182,8 +185,8 @@
for ( ; cur < limit; cur++ )
{
- cur->advance = FT_GET_USHORT();
- cur->bearing = FT_GET_SHORT();
+ cur->advance = FT_NEXT_USHORT( p );
+ cur->bearing = FT_NEXT_SHORT( p );
}
}
@@ -195,7 +198,7 @@
for ( ; cur < limit; cur++ )
- *cur = FT_GET_SHORT();
+ *cur = FT_NEXT_SHORT( p );
/* We fill up the missing left side bearings with the */
/* last valid value. Since this will occur for buggy CJK */
@@ -313,7 +316,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* tt_face_get_metrics */
+ /* tt_face_get_metrics */
/* */
/* <Description> */
/* Returns the horizontal or vertical metrics in font units for a */
++++++ ft2demos-2.2.1.20061013.tar.bz2 -> ft2demos-2.2.1.20061027.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ft2demos-2.2.1.20061013/ChangeLog new/ft2demos-2.2.1.20061027/ChangeLog
--- old/ft2demos-2.2.1.20061013/ChangeLog 2006-10-11 19:28:19.000000000 +0200
+++ new/ft2demos-2.2.1.20061027/ChangeLog 2006-10-27 17:24:17.000000000 +0200
@@ -1,3 +1,17 @@
+2006-10-23 Zhe Su <zsu(a)novell.com>
+
+ Add a benchmark for the emboldening algorithm.
+
+ * src/ftbench.c: Include FT_SYNTHESIS_H.
+ (FT_BENCH_EMBOLDEN): New enumeration value.
+ (bench_desc): Add `Embolden'.
+ (test_embolden): New function.
+ (main): Add it.
+
+2006-10-23 David Turner <david(a)freetype.org>
+
+ * src/ftgrid.c: Make the file compile again.
+
2006-10-11 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp>
* mac/ftoldmac.c (print_help): Renamed to...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ft2demos-2.2.1.20061013/src/ftbench.c new/ft2demos-2.2.1.20061027/src/ftbench.c
--- old/ft2demos-2.2.1.20061013/src/ftbench.c 2006-06-04 17:24:28.000000000 +0200
+++ new/ft2demos-2.2.1.20061027/src/ftbench.c 2006-10-27 17:24:17.000000000 +0200
@@ -20,6 +20,7 @@
#include FT_CACHE_CHARMAP_H
#include FT_CACHE_IMAGE_H
#include FT_CACHE_SMALL_BITMAPS_H
+#include FT_SYNTHESIS_H
#ifdef UNIX
@@ -79,6 +80,7 @@
FT_BENCH_CMAP,
FT_BENCH_CMAP_ITER,
FT_BENCH_NEW_FACE,
+ FT_BENCH_EMBOLDEN,
N_FT_BENCH
};
@@ -90,6 +92,7 @@
"Get glyph index",
"Iterate CMap",
"Open a new face",
+ "Embolden",
NULL
};
@@ -245,6 +248,30 @@
return done;
}
+int
+test_embolden( btimer_t* timer,
+ FT_Face face,
+ void* user_data )
+{
+ int i, done = 0;
+
+
+ FT_UNUSED( user_data );
+
+ for ( i = 0; i < face->num_glyphs; i++ )
+ {
+ if ( FT_Load_Glyph( face, i, load_flags ) )
+ continue;
+
+ TIMER_START( timer );
+ FT_GlyphSlot_Embolden ( face->glyph );
+ done++;
+ TIMER_STOP( timer );
+ }
+
+ return done;
+}
+
int
test_get_glyph( btimer_t* timer,
@@ -793,6 +820,11 @@
test.bench = test_new_face;
benchmark( face, &test, max_iter, max_time );
break;
+ case FT_BENCH_EMBOLDEN:
+ test.title = "Embolden";
+ test.bench = test_embolden;
+ benchmark( face, &test, max_iter, max_time );
+ break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ft2demos-2.2.1.20061013/src/ftgrid.c new/ft2demos-2.2.1.20061027/src/ftgrid.c
--- old/ft2demos-2.2.1.20061013/src/ftgrid.c 2006-09-27 10:46:37.000000000 +0200
+++ new/ft2demos-2.2.1.20061027/src/ftgrid.c 2006-10-27 17:24:17.000000000 +0200
@@ -40,8 +40,8 @@
#endif
-extern int _af_debug_disable_horz_hints;
-extern int _af_debug_disable_vert_hints;
+int _af_debug_disable_horz_hints;
+int _af_debug_disable_vert_hints;
typedef struct status_
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-inetd
checked in at Fri Oct 27 18:47:46 CEST 2006.
--------
--- yast2-inetd/yast2-inetd.changes 2006-10-10 12:23:11.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-inetd/yast2-inetd.changes 2006-10-27 15:17:22.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Oct 27 13:06:40 CEST 2006 - locilka(a)suse.cz
+
+- Adjusted the default configuration according to the current
+ status of services.
+- Do not install the package when it has been installed already,
+ Install it when needed (#215229).
+- Added inetd.rnc for AutoYaST profile validation (#215248).
+- 2.14.1
+
+-------------------------------------------------------------------
Old:
----
yast2-inetd-2.14.0.tar.bz2
New:
----
yast2-inetd-2.14.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-inetd.spec ++++++
--- /var/tmp/diff_new_pack.eBoLDT/_old 2006-10-27 18:47:13.000000000 +0200
+++ /var/tmp/diff_new_pack.eBoLDT/_new 2006-10-27 18:47:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-inetd (Version 2.14.0)
+# spec file for package yast2-inetd (Version 2.14.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-inetd
-Version: 2.14.0
+Version: 2.14.1
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-inetd-2.14.0.tar.bz2
+Source0: yast2-inetd-2.14.1.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(a)suse.cz>
%prep
-%setup -n yast2-inetd-2.14.0
+%setup -n yast2-inetd-2.14.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,9 +74,17 @@
/usr/share/YaST2/modules/Inetd.ycp
/usr/share/YaST2/modules/Inetd.ybc
%{prefix}/share/applications/YaST2/inetd.desktop
+/usr/share/YaST2/schema/autoyast/rnc/inetd.rnc
%doc %{prefix}/share/doc/packages/yast2-inetd
%changelog -n yast2-inetd
+* Fri Oct 27 2006 - locilka(a)suse.cz
+- Adjusted the default configuration according to the current
+ status of services.
+- Do not install the package when it has been installed already,
+ Install it when needed (#215229).
+- Added inetd.rnc for AutoYaST profile validation (#215248).
+- 2.14.1
* Tue Oct 10 2006 - locilka(a)suse.cz
- Merged SLES10 SP1 branch to openSUSE 10.2.
- 2.14.0
@@ -393,9 +401,9 @@
- 2.6.5
* Fri Aug 30 2002 - mike(a)suse.de
- bugfixes 15501 16420 16132 18266
-- network service editor misses lines from inetd.conf,
-- does not work,
-- create does not work
+ - network service editor misses lines from inetd.conf,
+ - does not work,
+ - create does not work
* Tue Aug 27 2002 - jsuchome(a)suse.cz
- provide/obsolete old translation packages
* Thu Aug 15 2002 - jsuchome(a)suse.cz
@@ -420,10 +428,10 @@
- Added _write, _auto for autoinstallation
* Mon Jan 21 2002 - nashif(a)suse.de
- migration to devtools
-- use standard copyright files
-- removed old menu entry
-- added testsuite
-- fixed syntax (select and lookup)
+ - use standard copyright files
+ - removed old menu entry
+ - added testsuite
+ - fixed syntax (select and lookup)
* Thu Sep 06 2001 - jbuch(a)suse.de
- Read -> SCR::Read(..)
* Mon Apr 30 2001 - jbuch(a)suse.de
++++++ yast2-inetd-2.14.0.tar.bz2 -> yast2-inetd-2.14.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/VERSION new/yast2-inetd-2.14.1/VERSION
--- old/yast2-inetd-2.14.0/VERSION 2006-10-10 12:24:31.000000000 +0200
+++ new/yast2-inetd-2.14.1/VERSION 2006-10-27 15:21:13.000000000 +0200
@@ -1 +1 @@
-2.14.0
+2.14.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/configure new/yast2-inetd-2.14.1/configure
--- old/yast2-inetd-2.14.0/configure 2006-10-10 12:23:52.000000000 +0200
+++ new/yast2-inetd-2.14.1/configure 2006-10-27 15:26:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-inetd 2.13.6.
+# Generated by GNU Autoconf 2.59 for yast2-inetd 2.14.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-inetd'
PACKAGE_TARNAME='yast2-inetd'
-PACKAGE_VERSION='2.13.6'
-PACKAGE_STRING='yast2-inetd 2.13.6'
+PACKAGE_VERSION='2.14.1'
+PACKAGE_STRING='yast2-inetd 2.14.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-inetd 2.13.6 to adapt to many kinds of systems.
+\`configure' configures yast2-inetd 2.14.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-inetd 2.13.6:";;
+ short | recursive ) echo "Configuration of yast2-inetd 2.14.1:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-inetd configure 2.13.6
+yast2-inetd configure 2.14.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-inetd $as_me 2.13.6, which was
+It was created by yast2-inetd $as_me 2.14.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-inetd'
- VERSION='2.13.6'
+ VERSION='2.14.1'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.6"
+VERSION="2.14.1"
RPMNAME="yast2-inetd"
MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>"
@@ -2284,7 +2284,7 @@
fi
- ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile"
+ ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/config/Makefile src/Makefile testsuite/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-inetd $as_me 2.13.6, which was
+This file was extended by yast2-inetd $as_me 2.14.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-inetd config.status 2.13.6
+yast2-inetd config.status 2.14.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -2855,6 +2855,7 @@
"agents/Makefile" ) CONFIG_FILES="$CONFIG_FILES agents/Makefile" ;;
"doc/autodocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "src/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/config/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/configure.in new/yast2-inetd-2.14.1/configure.in
--- old/yast2-inetd-2.14.0/configure.in 2006-10-10 12:23:47.000000000 +0200
+++ new/yast2-inetd-2.14.1/configure.in 2006-10-27 15:26:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-inetd, 2.13.6, http://bugs.opensuse.org/, yast2-inetd)
+AC_INIT(yast2-inetd, 2.14.1, 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.13.6"
+VERSION="2.14.1"
RPMNAME="yast2-inetd"
MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>"
@@ -147,6 +147,7 @@
AC_CONFIG_FILES(Makefile agents/Makefile
doc/autodocs/Makefile
doc/Makefile
+src/config/Makefile
src/Makefile
testsuite/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/Makefile.am new/yast2-inetd-2.14.1/src/Makefile.am
--- old/yast2-inetd-2.14.0/src/Makefile.am 2006-10-09 15:49:07.000000000 +0200
+++ new/yast2-inetd-2.14.1/src/Makefile.am 2006-10-27 13:52:59.000000000 +0200
@@ -41,5 +41,5 @@
YCPCFLAGS=-I.
-
+SUBDIRS = config
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(ydata_DATA) $(desktop_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/Makefile.in new/yast2-inetd-2.14.1/src/Makefile.in
--- old/yast2-inetd-2.14.0/src/Makefile.in 2006-10-10 12:23:54.000000000 +0200
+++ new/yast2-inetd-2.14.1/src/Makefile.in 2006-10-27 15:26:55.000000000 +0200
@@ -55,6 +55,12 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,6 +80,7 @@
$(ydata_DATA) $(ynclude_DATA)
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -221,8 +228,9 @@
NEWDEP = ${top_builddir}/.dep.new
ycpchook = inetd
YCPCFLAGS = -I.
+SUBDIRS = config
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(ydata_DATA) $(desktop_DATA)
-all: all-am
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
@@ -358,6 +366,77 @@
rm -f "$(DESTDIR)$(yncludedir)/$$f"; \
done
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -368,10 +447,23 @@
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -384,7 +476,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -434,25 +526,41 @@
|| exit 1; \
fi; \
done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(DATA)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(ydatadir)" "$(DESTDIR)$(yncludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -470,21 +578,21 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
-info: info-am
+info: info-recursive
info-am:
@@ -494,25 +602,25 @@
install-exec-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
@@ -520,18 +628,23 @@
uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \
uninstall-ydataDATA uninstall-yncludeDATA
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- ctags dist-hook distclean distclean-generic distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-clientDATA install-data install-data-am \
- install-desktopDATA install-exec install-exec-am install-info \
- install-info-am install-man install-moduleDATA \
- install-modulebinDATA install-strip install-ydataDATA \
- install-yncludeDATA installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-clientDATA uninstall-desktopDATA \
- uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-recursive ctags ctags-recursive \
+ dist-hook distclean distclean-generic distclean-recursive \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-clientDATA install-data \
+ install-data-am install-desktopDATA install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-moduleDATA install-modulebinDATA install-strip \
+ install-ydataDATA install-yncludeDATA installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \
+ uninstall-moduleDATA uninstall-modulebinDATA \
uninstall-ydataDATA uninstall-yncludeDATA
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/config/Makefile.am new/yast2-inetd-2.14.1/src/config/Makefile.am
--- old/yast2-inetd-2.14.0/src/config/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-inetd-2.14.1/src/config/Makefile.am 2006-10-27 13:40:14.000000000 +0200
@@ -0,0 +1,7 @@
+# Makefile.am for inetd/src/config
+
+rncdir = $(schemadir)/autoyast/rnc
+rnc_DATA = inetd.rnc
+
+EXTRA_DIST = $(rnc_DATA)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/config/Makefile.in new/yast2-inetd-2.14.1/src/config/Makefile.in
--- old/yast2-inetd-2.14.0/src/config/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-inetd-2.14.1/src/config/Makefile.in 2006-10-27 15:26:55.000000000 +0200
@@ -0,0 +1,341 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile.am for inetd/src/config
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/config
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(rncdir)"
+rncDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(rnc_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@
+CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@
+CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@
+CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINTAINER = @MAINTAINER@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RPMNAME = @RPMNAME@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+STYLESHEET_CSS = @STYLESHEET_CSS@
+STYLESHEET_HTML = @STYLESHEET_HTML@
+STYLESHEET_PDF = @STYLESHEET_PDF@
+STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@
+STYLESHEET_YDOC = @STYLESHEET_YDOC@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+YCPC = @YCPC@
+YCPDOC = @YCPDOC@
+YCPMAKEDEP = @YCPMAKEDEP@
+ac_ct_STRIP = @ac_ct_STRIP@
+agentdir = @agentdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+clientdir = @clientdir@
+datadir = @datadir@
+desktopdir = @desktopdir@
+docdir = @docdir@
+exec_prefix = @exec_prefix@
+execcompdir = @execcompdir@
+fillupdir = @fillupdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+imagedir = @imagedir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pkgconfigdatadir = @pkgconfigdatadir@
+pkgconfigdir = @pkgconfigdir@
+plugindir = @plugindir@
+potdir = @potdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+schemadir = @schemadir@
+scrconfdir = @scrconfdir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+themedir = @themedir@
+yast2dir = @yast2dir@
+ybindir = @ybindir@
+ydatadir = @ydatadir@
+yncludedir = @yncludedir@
+ystartupdir = @ystartupdir@
+rncdir = $(schemadir)/autoyast/rnc
+rnc_DATA = inetd.rnc
+EXTRA_DIST = $(rnc_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/config/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-rncDATA: $(rnc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(rncdir)" || $(mkdir_p) "$(DESTDIR)$(rncdir)"
+ @list='$(rnc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(rncDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rncdir)/$$f'"; \
+ $(rncDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rncdir)/$$f"; \
+ done
+
+uninstall-rncDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rnc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(rncdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rncdir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(rncdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-rncDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-rncDATA
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-rncDATA install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-info-am uninstall-rncDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/config/inetd.rnc new/yast2-inetd-2.14.1/src/config/inetd.rnc
--- old/yast2-inetd-2.14.0/src/config/inetd.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-inetd-2.14.1/src/config/inetd.rnc 2006-10-27 15:02:29.000000000 +0200
@@ -0,0 +1,24 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+inetd = element inetd {
+ element last_created { INTEGER }? &
+ element netd_conf {
+ LIST,
+ element conf {
+ element enabled { BOOLEAN }? &
+ element iid { text }? &
+ element protocol { text }? &
+ element script { text }? &
+ element server { text }? &
+ element service {
+ # Bug 215668 - jing - false positive error
+ # (attribute "type" from ... not allowed at this point;...)
+ attribute config:type { "boolean" }?, text
+ }
+ }*
+ }? &
+ element netd_service { SYMBOL }? &
+ element netd_status { INTEGER }?
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/default_conf_xinetd.ycp new/yast2-inetd-2.14.1/src/default_conf_xinetd.ycp
--- old/yast2-inetd-2.14.0/src/default_conf_xinetd.ycp 2006-10-10 12:23:41.000000000 +0200
+++ new/yast2-inetd-2.14.1/src/default_conf_xinetd.ycp 2006-10-27 15:24:18.000000000 +0200
@@ -1,6 +1,6 @@
// This file is generated by inetd/src/all-services.sh - DO NOT EDIT! --
// Maintainer: Lukas Ocilka <locilka(a)suse.cz>
-// $Id: default_conf_xinetd.ycp 33304 2006-10-10 10:23:39Z locilka $
+// $Id: default_conf_xinetd.ycp 33792 2006-10-27 13:24:16Z locilka $
{
textdomain "inetd";
@@ -546,7 +546,7 @@
"comment" : " default: off\n description: The talk server accepts talk requests for chatting with users \\\n on other systems.\n",
"comment_inside" : "",
"enabled" : false,
- "group" : "root",
+ "group" : "tty",
"iid" : "1:./etc/xinetd.d/ntalk",
"package" : "talk-server",
"protocol" : "udp",
@@ -557,7 +557,7 @@
"service" : "ntalk",
"socket_type" : "dgram",
"unparsed" : "\tflags\t\t= IPv4\n",
- "user" : "root",
+ "user" : "nobody",
"wait" : true
],
$[
@@ -834,7 +834,7 @@
"comment" : " default: off\n description: The talk server accepts talk requests for chatting with users \\\n on other systems.\n",
"comment_inside" : "",
"enabled" : false,
- "group" : "root",
+ "group" : "tty",
"iid" : "1:./etc/xinetd.d/talk",
"package" : "talk-server",
"protocol" : "udp",
@@ -845,7 +845,7 @@
"service" : "talk",
"socket_type" : "dgram",
"unparsed" : "\tflags\t\t= IPv4\n",
- "user" : "root",
+ "user" : "nobody",
"wait" : true
],
$[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/dialogs.ycp new/yast2-inetd-2.14.1/src/dialogs.ycp
--- old/yast2-inetd-2.14.0/src/dialogs.ycp 2006-10-10 12:23:41.000000000 +0200
+++ new/yast2-inetd-2.14.1/src/dialogs.ycp 2006-10-27 15:24:18.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Petr Hadraba <phadraba(a)suse.cz>
* Martin Lazar <mlazar(a)suse.cz>
*
- * $Id: dialogs.ycp 33304 2006-10-10 10:23:39Z locilka $
+ * $Id: dialogs.ycp 33792 2006-10-27 13:24:16Z locilka $
*/
{
@@ -237,7 +237,7 @@
else
{
// ids of NotInstalled table items start with NI
- if (regexpmatch(id, "^NI"))
+ if (! regexpmatch(id, "^NI"))
return nil;
}
return id;
@@ -721,7 +721,7 @@
}
}
- Wizard::RestoreScreenShotName();
+ // Wizard::RestoreScreenShotName();
return (symbol) ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.14.0/src/inetd.desktop new/yast2-inetd-2.14.1/src/inetd.desktop
--- old/yast2-inetd-2.14.0/src/inetd.desktop 2006-10-09 15:49:07.000000000 +0200
+++ new/yast2-inetd-2.14.1/src/inetd.desktop 2006-10-27 13:58:29.000000000 +0200
@@ -16,6 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=
X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=inetd.rnc
Icon=yast-inetd
Exec=/sbin/yast2 inetd
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package evolution-data-server
checked in at Fri Oct 27 18:47:18 CEST 2006.
--------
--- GNOME/evolution-data-server/evolution-data-server.changes 2006-10-18 11:49:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2006-10-27 17:32:19.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 27 17:27:44 CEST 2006 - vvaradhan(a)novell.com
+
+- Fixes (bnc)
+ Bug 208519 - evolution groupwise crashes on start
+ - Commented "bnc-164323-random-mark-unread.patch" (patch46)
+ as it is a "to-be" reverted patch.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-data-server.spec ++++++
--- /var/tmp/diff_new_pack.soiIi7/_old 2006-10-27 18:46:55.000000000 +0200
+++ /var/tmp/diff_new_pack.soiIi7/_new 2006-10-27 18:46:55.000000000 +0200
@@ -18,7 +18,7 @@
Autoreqprov: on
Summary: Evolution Data Server
Version: 1.8.1
-Release: 6
+Release: 13
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.8/%{name}-%{v…
#Patch3: evolution-data-server-gcc4.patch
Patch5: evolution-data-server-configure.patch
@@ -186,7 +186,7 @@
%patch43
%patch44
#%patch45
-%patch46
+#%patch46
#%patch47
#%patch48
#%patch49
@@ -275,6 +275,11 @@
%{prefix}/share/gtk-doc/html/*
%changelog -n evolution-data-server
+* Fri Oct 27 2006 - vvaradhan(a)novell.com
+- Fixes (bnc)
+ Bug 208519 - evolution groupwise crashes on start
+ - Commented "bnc-164323-random-mark-unread.patch" (patch46)
+ as it is a "to-be" reverted patch.
* Wed Oct 18 2006 - schwab(a)suse.de
- Fix missing declaration.
* Mon Oct 02 2006 - jhargadon(a)suse.de
@@ -415,7 +420,7 @@
error popups - Chenthill
164140 EDS Crashed when starting 'evolution --offline' - Devashish
164367 GW: Attachment to appointments/meetings throws 'Unknown Error'
-- Chenthill
+ - Chenthill
164676 evolution-data-server stuck in tight loop - Devashish
* Fri Apr 07 2006 - vvaradhan(a)novell.com
- Fixes (bnc)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-devtools
checked in at Fri Oct 27 18:47:09 CEST 2006.
--------
--- yast2-devtools/yast2-devtools.changes 2006-10-24 17:10:52.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-devtools/yast2-devtools.changes 2006-10-27 15:28:29.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 27 15:24:01 CEST 2006 - mvidner(a)suse.cz
+
+- Made the yast2-testsuite check only a warning, otherwise too many
+ packages would break.
+- prefixbuild/pfx: Let also Perl search in the prefix (via PERL5LIB).
+- 2.13.29
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.13.28.tar.bz2
New:
----
yast2-devtools-2.13.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.7d2AiH/_old 2006-10-27 18:46:46.000000000 +0200
+++ /var/tmp/diff_new_pack.7d2AiH/_new 2006-10-27 18:46:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-devtools (Version 2.13.28)
+# spec file for package yast2-devtools (Version 2.13.29)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-devtools
-Version: 2.13.28
+Version: 2.13.29
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-devtools-2.13.28.tar.bz2
+Source0: yast2-devtools-2.13.29.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer sgml-skel
Requires: perl
@@ -48,7 +48,7 @@
Michal Svec <msvec(a)suse.cz>
%prep
-%setup -n yast2-devtools-2.13.28
+%setup -n yast2-devtools-2.13.29
%build
autoreconf --force --install
@@ -86,6 +86,11 @@
%doc %{prefix}/share/doc/packages/yast2-devtools
%changelog -n yast2-devtools
+* Fri Oct 27 2006 - mvidner(a)suse.cz
+- Made the yast2-testsuite check only a warning, otherwise too many
+ packages would break.
+- prefixbuild/pfx: Let also Perl search in the prefix (via PERL5LIB).
+- 2.13.29
* Tue Oct 24 2006 - mvidner(a)suse.cz
- Run pkg-config at configure time, not at make time (#208998).
- For YCP packages, check for yast2-testsuite at configure time (#208999).
++++++ yast2-devtools-2.13.28.tar.bz2 -> yast2-devtools-2.13.29.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.13.28/VERSION new/yast2-devtools-2.13.29/VERSION
--- old/yast2-devtools-2.13.28/VERSION 2006-10-24 17:12:54.000000000 +0200
+++ new/yast2-devtools-2.13.29/VERSION 2006-10-27 15:28:29.000000000 +0200
@@ -1 +1 @@
-2.13.28
+2.13.29
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.13.28/configure new/yast2-devtools-2.13.29/configure
--- old/yast2-devtools-2.13.28/configure 2006-10-24 17:16:33.000000000 +0200
+++ new/yast2-devtools-2.13.29/configure 2006-10-27 15:32:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-devtools 2.13.28.
+# Generated by GNU Autoconf 2.59 for yast2-devtools 2.13.29.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.13.28'
-PACKAGE_STRING='yast2-devtools 2.13.28'
+PACKAGE_VERSION='2.13.29'
+PACKAGE_STRING='yast2-devtools 2.13.29'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -959,7 +959,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-devtools 2.13.28 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.13.29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.13.28:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.13.29:";;
esac
cat <<\_ACEOF
@@ -1169,7 +1169,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.13.28
+yast2-devtools configure 2.13.29
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-devtools $as_me 2.13.28, which was
+It was created by yast2-devtools $as_me 2.13.29, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1913,7 +1913,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.13.28'
+ VERSION='2.13.29'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
-VERSION="2.13.28"
+VERSION="2.13.29"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -20005,7 +20005,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-devtools $as_me 2.13.28, which was
+This file was extended by yast2-devtools $as_me 2.13.29, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20063,7 +20063,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-devtools config.status 2.13.28
+yast2-devtools config.status 2.13.29
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.13.28/configure.in new/yast2-devtools-2.13.29/configure.in
--- old/yast2-devtools-2.13.28/configure.in 2006-10-24 17:16:09.000000000 +0200
+++ new/yast2-devtools-2.13.29/configure.in 2006-10-27 15:32:10.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.13.28, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.13.29, http://bugs.opensuse.org/, yast2-devtools)
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.13.28"
+VERSION="2.13.29"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.13.28/devtools/bin/version new/yast2-devtools-2.13.29/devtools/bin/version
--- old/yast2-devtools-2.13.28/devtools/bin/version 2006-10-24 17:17:15.000000000 +0200
+++ new/yast2-devtools-2.13.29/devtools/bin/version 2006-10-27 15:33:30.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.13.28
+echo 2.13.29
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.13.28/devtools/bin/y2autoconf new/yast2-devtools-2.13.29/devtools/bin/y2autoconf
--- old/yast2-devtools-2.13.28/devtools/bin/y2autoconf 2006-10-24 17:14:06.000000000 +0200
+++ new/yast2-devtools-2.13.29/devtools/bin/y2autoconf 2006-10-27 15:31:58.000000000 +0200
@@ -28,7 +28,7 @@
# Michal Svec <msvec(a)suse.cz>
# Martin Vidner <mvidner(a)suse.cz>
#
-# $Id: y2autoconf 33647 2006-10-24 15:14:02Z mvidner $
+# $Id: y2autoconf 33798 2006-10-27 13:31:57Z mvidner $
if ($#ARGV >= 0 && ($ARGV[0] eq "-h" || $ARGV[0] eq "--help"))
{
@@ -363,7 +363,7 @@
AC_MSG_ERROR([ycpc is not installed])
fi
AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_ERROR([yast2-testsuite.rpm is not installed])
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
',
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package esound
checked in at Fri Oct 27 18:46:49 CEST 2006.
--------
--- GNOME/esound/esound.changes 2006-08-17 09:36:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/esound/esound.changes 2006-10-27 17:36:28.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 27 17:35:52 CEST 2006 - sbrabec(a)suse.cz
+
+- Moved libesd.so to the main package, as required by
+ flash-player (#212515).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ esound.spec ++++++
--- /var/tmp/diff_new_pack.blOpqV/_old 2006-10-27 18:46:19.000000000 +0200
+++ /var/tmp/diff_new_pack.blOpqV/_new 2006-10-27 18:46:19.000000000 +0200
@@ -12,12 +12,12 @@
Name: esound
BuildRequires: alsa-devel audiofile-devel tcpd-devel
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/Sound Daemons
Autoreqprov: on
Summary: A Sound Daemon for Enlightenment and GNOME
Version: 0.2.36
-Release: 21
+Release: 35
URL: ftp://ftp.gnome.org/pub/gnome/sources/esound/
Source: ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/%{name}-%{version}.tar.bz2
Source1: esound.init
@@ -127,6 +127,8 @@
%doc README AUTHORS COPYING.LIB INSTALL NEWS TODO TIPS MAINTAINERS
%config /etc/esd.conf
%_libdir/lib*.so.*
+# libesd.so or libesd.so.1 is required by binary-only flash-player (#212515).
+%_libdir/libesd.so
%{_prefix}/bin/esd
%{_prefix}/bin/esdcat
%{_prefix}/bin/esdctl
@@ -158,10 +160,13 @@
%{_prefix}/share/aclocal/*
%{_prefix}/share/man/man1/esd-config.1.gz
%_libdir/lib*.*a
-%_libdir/lib*.so
+%_libdir/libesddsp.so
%_libdir/pkgconfig/esound.pc
%changelog -n esound
+* Fri Oct 27 2006 - sbrabec(a)suse.cz
+- Moved libesd.so to the main package, as required by
+ flash-player (#212515).
* Thu Aug 17 2006 - aj(a)suse.de
- Reduce BuildRequires to not depend on TeX.
* Tue May 23 2006 - joeshaw(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xdg-utils
checked in at Fri Oct 27 18:46:40 CEST 2006.
--------
--- xdg-utils/xdg-utils.changes 2006-09-27 11:59:17.000000000 +0200
+++ /mounts/work_src_done/NOARCH/xdg-utils/xdg-utils.changes 2006-10-27 18:04:39.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 27 18:04:35 CEST 2006 - dmueller(a)suse.de
+
+- don't build as root
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-utils.spec ++++++
--- /var/tmp/diff_new_pack.fOYQZ5/_old 2006-10-27 18:46:25.000000000 +0200
+++ /var/tmp/diff_new_pack.fOYQZ5/_new 2006-10-27 18:46:25.000000000 +0200
@@ -8,6 +8,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: xdg-utils
BuildRequires: make xmlto
@@ -15,7 +16,7 @@
Group: System/GUI/Other
Summary: Utilities to uniformly interface desktop environments
Version: 1.0
-Release: 1
+Release: 11
BuildArch: noarch
URL: http://portland.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -77,6 +78,8 @@
%{_mandir}/man1/xdg-screensaver.1.gz
%changelog -n xdg-utils
+* Fri Oct 27 2006 - dmueller(a)suse.de
+- don't build as root
* Wed Sep 27 2006 - dmueller(a)suse.de
- update to 1.0rc1:
* for changes, see /usr/share/doc/packages/xdg-utils/ChangeLog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package opensuse-manual_en
checked in at Fri Oct 27 18:46:19 CEST 2006.
--------
--- opensuse-manual_en/opensuse-manual_en.changes 2006-10-26 15:51:29.000000000 +0200
+++ /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-manual_en.changes 2006-10-27 18:04:03.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 27 18:03:55 CEST 2006 - dmueller(a)suse.de
+
+- don't build as root
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manual_en.spec ++++++
--- /var/tmp/diff_new_pack.ZSrkgX/_old 2006-10-27 18:45:51.000000000 +0200
+++ /var/tmp/diff_new_pack.ZSrkgX/_new 2006-10-27 18:45:51.000000000 +0200
@@ -8,12 +8,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: opensuse-manual_en
%define my_lang en
%define my_book opensuse-html
Version: 10.2
-Release: 11
+Release: 12
#OBS
Source00: opensuse-html_en-html.tar.bz2
Source01: opensuse-html_en-desktop.tar.bz2
@@ -40,7 +41,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
Group: Documentation/SuSE
-License: Other uncritical OpenSource License
+License: Commercial (all types)
Summary: openSUSE Manual (English)
%define _defaultdocdir %{_datadir}/doc/manual
%define _docdir %{_datadir}/doc/manual
@@ -53,7 +54,7 @@
%package pdf
Group: Documentation/SuSE
-License: Other uncritical OpenSource License
+License: Commercial (all types), Other License(s), see package
Summary: openSUSE Manual (English) as PDF
#PDFOBS
@@ -156,6 +157,8 @@
%dir /opt/gnome/share/gnome/help
%changelog -n opensuse-manual_en
+* Fri Oct 27 2006 - dmueller(a)suse.de
+- don't build as root
* Thu Oct 26 2006 - ke(a)suse.de
- Update xml and image files and build new output formats; still
preliminary.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package eog
checked in at Fri Oct 27 18:46:11 CEST 2006.
--------
--- GNOME/eog/eog.changes 2006-10-13 08:01:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/eog/eog.changes 2006-10-27 13:39:28.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 27 13:38:54 CEST 2006 - meissner(a)suse.de
+
+- If we only have "short" space for an entry, only
+ try to write a "short" in there, not a "long". #214690
+
+-------------------------------------------------------------------
New:
----
eog-pixeldim.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eog.spec ++++++
--- /var/tmp/diff_new_pack.QaN34g/_old 2006-10-27 18:45:50.000000000 +0200
+++ /var/tmp/diff_new_pack.QaN34g/_new 2006-10-27 18:45:50.000000000 +0200
@@ -14,17 +14,18 @@
BuildRequires: eel-devel gnome-doc-utils-devel gnutls-devel indent kdelibs3-doc libexif libgnomeprintui-devel libidl librsvg-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
-License: GPL, LGPL
+License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Graphics/Viewers
Provides: eog2
Obsoletes: eog2
Autoreqprov: on
Version: 2.16.1
-Release: 3
+Release: 14
Summary: Eye of GNOME for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2
Patch: eog-casts.patch
Patch1: eog-fast-image-switch-crash.patch
+Patch2: eog-pixeldim.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: gconf2
@@ -40,6 +41,7 @@
%setup -q
%patch
%patch1
+%patch2
%build
CFLAGS="$RPM_OPT_FLAGS" \
@@ -92,6 +94,9 @@
%{prefix}/share/pixmaps/eog
%changelog -n eog
+* Fri Oct 27 2006 - meissner(a)suse.de
+- If we only have "short" space for an entry, only
+ try to write a "short" in there, not a "long". #214690
* Fri Oct 13 2006 - aj(a)suse.de
- Add gnome-doc-utils-devel to BuildRequires.
* Tue Oct 03 2006 - jhargadon(a)suse.de
++++++ eog-pixeldim.patch ++++++
--- libeog/eog-image.c
+++ libeog/eog-image.c
@@ -365,12 +365,20 @@
entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_X_DIMENSION);
if (entry != NULL && (priv->width >= 0)) {
- exif_set_long (entry->data, bo, priv->width);
+ if (entry->format == EXIF_FORMAT_LONG)
+ exif_set_long (entry->data, bo, priv->width);
+ if (entry->format == EXIF_FORMAT_SHORT)
+ exif_set_short (entry->data, bo, priv->width);
+ /* other number formats should not happen */
}
entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_Y_DIMENSION);
if (entry != NULL && (priv->height >= 0)) {
- exif_set_long (entry->data, bo, priv->height);
+ if (entry->format == EXIF_FORMAT_LONG)
+ exif_set_long (entry->data, bo, priv->height);
+ if (entry->format == EXIF_FORMAT_SHORT)
+ exif_set_short (entry->data, bo, priv->height);
+ /* other number formats should not happen */
}
}
#else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cyrus-sasl
checked in at Fri Oct 27 18:45:43 CEST 2006.
--------
--- cyrus-sasl/cyrus-sasl-saslauthd.changes 2006-09-25 21:53:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/cyrus-sasl/cyrus-sasl-saslauthd.changes 2006-10-27 18:45:20.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 27 13:20:59 CEST 2006 - rhafer(a)suse.de
+
+- Use /etc/sasl2/ as directory for config files of services
+ %{_libdir} can still be used for backwards compatibilty
+ (Bug #206414)
+
+-------------------------------------------------------------------
cyrus-sasl.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-sasl-saslauthd.spec ++++++
--- /var/tmp/diff_new_pack.RUZcxN/_old 2006-10-27 18:45:24.000000000 +0200
+++ /var/tmp/diff_new_pack.RUZcxN/_new 2006-10-27 18:45:24.000000000 +0200
@@ -12,7 +12,7 @@
Name: cyrus-sasl-saslauthd
BuildRequires: db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel
-License: BSD, Other License(s), see package
+License: BSD License and BSD-like, Other License(s), see package
Group: Productivity/Networking/Other
URL: http://asg.web.cmu.edu/sasl/
Autoreqprov: on
@@ -20,7 +20,7 @@
Provides: cyrus-sasl2:/usr/sbin/saslauthd
Summary: The SASL Authentication Server
Version: 2.1.22
-Release: 10
+Release: 18
Source: cyrus-sasl-%{version}.tar.bz2
Source1: cyrus-sasl-rc.tar.gz
Patch: cyrus-sasl-%{version}.dif
@@ -100,6 +100,7 @@
export CPPFLAGS=-I/usr/include/heimdal
./configure --libdir=%{_libdir} \
--with-plugindir=%{_libdir}/sasl2 \
+ --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=%{_mandir} \
@@ -178,6 +179,10 @@
%{_libdir}/sasl2/libldapdb.so*
%changelog -n cyrus-sasl-saslauthd
+* Fri Oct 27 2006 - rhafer(a)suse.de
+- Use /etc/sasl2/ as directory for config files of services
+ %%{_libdir} can still be used for backwards compatibilty
+ (Bug #206414)
* Mon Sep 25 2006 - rhafer(a)suse.de
- Remove unneeded automake/autoheader calls
* Mon Sep 11 2006 - rhafer(a)suse.de
@@ -305,10 +310,10 @@
- renamed to cyrus-sasl
- splitted libraries for the following auth methods into seperate
packages:
-- crammd5
-- digestmd5
-- otp
-- plain
+ - crammd5
+ - digestmd5
+ - otp
+ - plain
this is to prevent from annoying warnings about missing proper
setup of mechanisms we don't use
* Thu Mar 06 2003 - choeger(a)suse.de
++++++ cyrus-sasl.spec ++++++
--- /var/tmp/diff_new_pack.RUZcxN/_old 2006-10-27 18:45:24.000000000 +0200
+++ /var/tmp/diff_new_pack.RUZcxN/_new 2006-10-27 18:45:24.000000000 +0200
@@ -14,13 +14,13 @@
BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel
Obsoletes: cyrus-sasl2
Provides: cyrus-sasl2
-License: BSD, Other License(s), see package
+License: BSD License and BSD-like, Other License(s), see package
Group: Productivity/Networking/Other
URL: http://asg.web.cmu.edu/sasl/
Autoreqprov: on
Summary: Implementation of Cyrus SASL API
Version: 2.1.22
-Release: 10
+Release: 18
Source: cyrus-sasl-%{version}.tar.bz2
Source1: cyrus-sasl-rc.tar.gz
Source2: README.Source
@@ -198,6 +198,7 @@
export CPPFLAGS=-I/usr/include/heimdal
./configure --libdir=%{_libdir} \
--with-plugindir=%{_libdir}/sasl2 \
+ --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=%{_mandir} \
@@ -215,6 +216,7 @@
make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
install -m 755 -d $RPM_BUILD_ROOT/var/run/sasl2
mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/etc/sasl2
install -m 755 sample/.libs/client $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_client
install -m 755 sample/.libs/server $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_server
cd utils
@@ -236,6 +238,7 @@
%files
%defattr(-,root,root)
%dir %{_libdir}/sasl2
+%dir /etc/sasl2/
%{_libdir}/sasl2/libanonymous.so*
%{_libdir}/sasl2/liblogin.so*
%{_libdir}/sasl2/libsasldb.so*
@@ -277,6 +280,10 @@
%{_libdir}/libsasl2.la
%changelog -n cyrus-sasl
+* Fri Oct 27 2006 - rhafer(a)suse.de
+- Use /etc/sasl2/ as directory for config files of services
+ %%{_libdir} can still be used for backwards compatibilty
+ (Bug #206414)
* Mon Sep 25 2006 - rhafer(a)suse.de
- Remove unneeded automake/autoheader calls
* Mon Sep 11 2006 - rhafer(a)suse.de
@@ -404,10 +411,10 @@
- renamed to cyrus-sasl
- splitted libraries for the following auth methods into seperate
packages:
-- crammd5
-- digestmd5
-- otp
-- plain
+ - crammd5
+ - digestmd5
+ - otp
+ - plain
this is to prevent from annoying warnings about missing proper
setup of mechanisms we don't use
* Thu Mar 06 2003 - choeger(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0