Hello community, here is the log from the commit of package slang for openSUSE:Factory checked in at 2015-03-03 11:12:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slang (Old) and /work/SRC/openSUSE:Factory/.slang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slang" Changes: -------- --- /work/SRC/openSUSE:Factory/slang/slang.changes 2014-08-28 21:05:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.slang.new/slang.changes 2015-03-03 11:12:43.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Feb 28 19:06:46 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Add gpg signature +- Remove upstreamed patch + * sprintf-bug-concerning-c-for-8-bit-character-in-non-.patch +- Update to 2.3.0 + * numerous changes, see included changes.txt for a detailed + list + +------------------------------------------------------------------- Old: ---- slang-2.2.4.tar.bz2 sprintf-bug-concerning-c-for-8-bit-character-in-non-.patch New: ---- slang-2.3.0.tar.bz2 slang-2.3.0.tar.bz2.asc slang.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.53eAy2/_old 2015-03-03 11:12:44.000000000 +0100 +++ /var/tmp/diff_new_pack.53eAy2/_new 2015-03-03 11:12:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package slang # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,33 +17,34 @@ Name: slang -Version: 2.2.4 +Version: 2.3.0 Release: 0 Summary: Programming Library and Embeddable Extansion Language License: GPL-2.0+ Group: System/Libraries Url: http://www.jedsoft.org/ -Source: ftp://space.mit.edu/pub/davis/slang/v2.2/slang-%{version}.tar.bz2 -Source2: baselibs.conf +Source0: http://www.jedsoft.org/releases/slang/slang-%{version}.tar.bz2 +Source1: http://www.jedsoft.org/releases/slang/slang-%{version}.tar.bz2.asc +Source2: %{name}.keyring +Source3: baselibs.conf Patch0: slang.patch Patch1: slang-autoconf.patch Patch2: slang-fsuid.patch Patch4: slang-libpng12-linker-flag.patch -# PATCH-FIX-UPSTREAM, sprintf bug (concerning %c for 8-bit character in non-UTF8 mode) fixed -Patch5: sprintf-bug-concerning-c-for-8-bit-character-in-non-.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: pcre-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1210 BuildRequires: oniguruma-devel >= 5.9.0 %endif -BuildRequires: pcre-devel %if 0%{?suse_version} > 1120 BuildRequires: libpng12-devel %else BuildRequires: libpng-devel %endif -BuildRequires: automake -BuildRequires: pkgconfig -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description S-Lang is a multi-platform programming library designed to allow a developer to @@ -53,23 +54,16 @@ S-Lang extension language which can be embedded into an application to make it extensible. With slsh a standalone interpreter is available as well. - %package slsh Summary: Interpreter for S-Lang Scripts Group: Development/Languages/Other -Provides: slang = %version +Provides: slang = %{version} Obsoletes: slang <= 2.1.1 -# bug437293 -%ifarch ppc64 -Obsoletes: slang-64bit -%endif -# %description slsh slsh is a standalone interpreter of the S-Lang language. It can be used to execute scripts or interactively. - %package -n libslang2 Summary: Programming Library and Embeddable Extension Language Group: System/Libraries @@ -82,17 +76,11 @@ S-Lang extension language which can be embedded into an application to make it extensible. With slsh a standalone interpreter is available as well. - %package devel Summary: Programming Library and Embeddable Extension Language - Development Package Group: Development/Languages/C and C++ Requires: libslang2 = %{version} -Provides: slang:/usr/include/slang.h -# bug437293 -%ifarch ppc64 -Obsoletes: slang-devel-64bit -%endif -# +Provides: slang:%{_includedir}/slang.h %description devel S-Lang is a multi-platform programming library designed to allow a developer to @@ -105,14 +93,12 @@ This package contains all necessary include files and libraries needed to develop applications that require it. - %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch4 -p1 -%patch5 -p1 %build mv autoconf/configure.ac . @@ -120,21 +106,21 @@ #autoheader -I autoconf aclocal -I autoconf --output=autoconf/aclocal.m4 autoconf -I autoconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" +export CFLAGS="%{optflags} -fno-strict-aliasing -fstack-protector" export ELF_CFLAGS="$CFLAGS" %configure \ - --docdir=%{_datadir}/doc/packages/slang-devel \ + --docdir=%{_docdir}/slang-devel \ --with-pcre \ - --with-pnginc=/usr/include/libpng12 \ - --with-pnglib=/usr/lib \ + --with-pnginc=%{_includedir}/libpng12 \ + --with-pnglib=%{_libexecdir} \ --with-z # --with-onig # parallel make still broken in 2.2.2 -make -make static +make --jobs 1 +make static --jobs 1 %install -%makeinstall install-static +make DESTDIR=%{buildroot} install install-static rm -rf %{buildroot}%{_datadir}/doc/ ++++++ slang-2.2.4.tar.bz2 -> slang-2.3.0.tar.bz2 ++++++ ++++ 42725 lines of diff (skipped) ++++++ slang-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.53eAy2/_old 2015-03-03 11:12:45.000000000 +0100 +++ /var/tmp/diff_new_pack.53eAy2/_new 2015-03-03 11:12:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: slang-2.2.4/autoconf/aclocal.m4 +Index: slang-2.3.0/autoconf/aclocal.m4 =================================================================== ---- slang-2.2.4.orig/autoconf/aclocal.m4 -+++ slang-2.2.4/autoconf/aclocal.m4 -@@ -331,8 +331,11 @@ then +--- slang-2.3.0.orig/autoconf/aclocal.m4 ++++ slang-2.3.0/autoconf/aclocal.m4 +@@ -358,8 +358,11 @@ then if test -n "$gcc_warnings" then CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ @@ -16,7 +16,7 @@ # Now trim excess whitespace CFLAGS=`echo $CFLAGS` fi -@@ -545,7 +548,7 @@ dnl # Check for dynamic linker +@@ -572,7 +575,7 @@ dnl # Check for dynamic linker dnl #------------------------------------------------------------------------- DYNAMIC_LINK_LIB="" @@ -25,7 +25,7 @@ AC_CHECK_HEADER(dlfcn.h,[ AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header]) -@@ -586,7 +589,7 @@ case "$host_os" in +@@ -613,7 +616,7 @@ case "$host_os" in *linux*|*gnu*|k*bsd*-gnu ) DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" ELF_CC="\$(CC)" @@ -33,11 +33,11 @@ + ELF_CFLAGS="$ELF_CFLAGS -fPIC" ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" - CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" -Index: slang-2.2.4/autoconf/configure.ac + CC_SHARED_FLAGS="-shared -fPIC" +Index: slang-2.3.0/autoconf/configure.ac =================================================================== ---- slang-2.2.4.orig/autoconf/configure.ac -+++ slang-2.2.4/autoconf/configure.ac +--- slang-2.3.0.orig/autoconf/configure.ac ++++ slang-2.3.0/autoconf/configure.ac @@ -17,6 +17,62 @@ dnl# fi AC_CONFIG_AUX_DIR(autoconf) AC_CANONICAL_HOST @@ -101,7 +101,7 @@ JD_INIT JD_ANSI_CC -@@ -262,7 +318,7 @@ else +@@ -284,7 +340,7 @@ else fi AC_SUBST(ZLIB_MODULE) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
