rpm/gettext-runtime
SHA256
1
0
Fork 0
forked from pool/gettext-runtime
Code Pull Requests Activity

Accepting request 179097 from Base:System

Browse Source 
- Add glib2-devel libcroco-devel libxml2-devel to build requires to avoid
  using the included copies.
- gettext-configure.patch: Fix syntax in libxml check to avoid spurious
  failure (forwarded request 179093 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/179097
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2013-06-17 08:33:30 +00:00 committed by Git OBS Bridge
commit 8d19bf51ea
7 changed files with 140 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
gettext-configure.patch Normal file
View File

@ -0,0 +1,101 @@
Index: gettext-0.18.2.1/gettext-tools/configure
===================================================================
--- gettext-0.18.2.1.orig/gettext-tools/configure
+++ gettext-0.18.2.1/gettext-tools/configure
@@ -40566,13 +40566,13 @@ fi
LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-[#include <libxml/xmlversion.h>
+#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]
+
int
main ()
{
-[xmlCheckVersion (0); xmlFree ((void *) 0);]
+xmlCheckVersion (0); xmlFree ((void *) 0);
;
return 0;
}
@@ -40590,13 +40590,13 @@ rm -f core conftest.err conftest.$ac_obj
CPPFLAGS="$CPPFLAGS $INCXML2"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-[#include <libxml/xmlversion.h>
+#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]
+
int
main ()
{
-[xmlCheckVersion (0); xmlFree ((void *) 0);]
+xmlCheckVersion (0); xmlFree ((void *) 0);
;
return 0;
}
@@ -40746,13 +40746,13 @@ rm -f conftest.err conftest.i conftest.$
CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-[#include <libxml/xmlversion.h>
+#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]
+
int
main ()
{
-[xmlCheckVersion (0); xmlFree ((void *) 0);]
+xmlCheckVersion (0); xmlFree ((void *) 0);
;
return 0;
}
Index: gettext-0.18.2.1/gettext-tools/gnulib-m4/libxml.m4
===================================================================
--- gettext-0.18.2.1.orig/gettext-tools/gnulib-m4/libxml.m4
+++ gettext-0.18.2.1/gettext-tools/gnulib-m4/libxml.m4
@@ -42,10 +42,10 @@ AC_DEFUN([gl_LIBXML],
dnl -Wl,--disable-auto-import.
AC_LIB_LINKFLAGS_BODY([xml2])
LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
- AC_TRY_LINK([[#include <libxml/xmlversion.h>
+ AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]],
- [[xmlCheckVersion (0); xmlFree ((void *) 0);]],
+ ],
+ [xmlCheckVersion (0); xmlFree ((void *) 0);],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -53,10 +53,10 @@ AC_DEFUN([gl_LIBXML],
if test "$gl_cv_libxml" != yes; then
gl_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCXML2"
- AC_TRY_LINK([[#include <libxml/xmlversion.h>
+ AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]],
- [[xmlCheckVersion (0); xmlFree ((void *) 0);]],
+ ],
+ [xmlCheckVersion (0); xmlFree ((void *) 0);],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -80,10 +80,10 @@ AC_DEFUN([gl_LIBXML],
fi
if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
- AC_TRY_LINK([[#include <libxml/xmlversion.h>
+ AC_TRY_LINK([#include <libxml/xmlversion.h>
#include <libxml/xmlmemory.h>
- ]],
- [[xmlCheckVersion (0); xmlFree ((void *) 0);]],
+ ],
+ [xmlCheckVersion (0); xmlFree ((void *) 0);],
[gl_cv_libxml=yes
gl_cv_LIBXML="$LIBXML2 $LIBICONV"
gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"

8
gettext-csharp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jun 15 11:52:06 UTC 2013 - schwab@linux-m68k.org
- Add glib2-devel libcroco-devel libxml2-devel to build requires to avoid
using the included copies.
- gettext-configure.patch: Fix syntax in libxml check to avoid spurious
failure
-------------------------------------------------------------------
Sat Jun 8 08:39:07 UTC 2013 - christoph.miebach@web.de

5
gettext-csharp.spec
View File

@ -19,7 +19,10 @@
Name: gettext-csharp
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libcroco-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: mono-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
@ -41,6 +44,7 @@ Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-configure.patch
%description
Mono with its 'resgen' program uses a design that Microsoft created and
@ -71,6 +75,7 @@ reliably than 'resgen'.
%patch4
%patch5
%patch9
%patch10 -p1
%build
export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"

8
gettext-java.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jun 15 11:52:06 UTC 2013 - schwab@linux-m68k.org
- Add glib2-devel libcroco-devel libxml2-devel to build requires to avoid
using the included copies.
- gettext-configure.patch: Fix syntax in libxml check to avoid spurious
failure
-------------------------------------------------------------------
Sat Jun 8 08:39:07 UTC 2013 - christoph.miebach@web.de

5
gettext-java.spec
View File

@ -20,7 +20,10 @@ Name: gettext-java
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gcc-java
BuildRequires: glib2-devel
BuildRequires: libcroco-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
Url: http://www.gnu.org/software/gettext/
@ -40,6 +43,7 @@ Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-configure.patch
%description
This package includes the tools needed to support message catalogs in
@ -53,6 +57,7 @@ java+swing.
%patch4
%patch5
%patch9
%patch10 -p1
%build
export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"

8
gettext-runtime.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jun 15 11:52:06 UTC 2013 - schwab@linux-m68k.org
- Add glib2-devel libcroco-devel libxml2-devel to build requires to avoid
using the included copies.
- gettext-configure.patch: Fix syntax in libxml check to avoid spurious
failure
-------------------------------------------------------------------
Sat Jun 8 08:39:07 UTC 2013 - christoph.miebach@web.de

5
gettext-runtime.spec
View File

@ -22,7 +22,10 @@ Name: gettext-runtime
Version: 0.18.2.1
Release: 0
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libcroco-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
# To get an updated linkdupes.sh (in case there are new dupes), temproarily enable:
@ -51,6 +54,7 @@ Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-configure.patch
%description
This package contains the intl library as well as tools that ease the
@ -89,6 +93,7 @@ binary catalogs.
%patch4
%patch5
%patch9
%patch10 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."