# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346172900 -7200 # Node ID 7a661723594660d9a1671c7974d66c8430f96285 # Parent c1ab501b4751784fc32ec0dba40248de43dd9985 Remove package for appending now since 20100101 redundant boilerplate code. diff -r c1ab501b4751 -r 7a6617235946 gettext/gettext.patch --- a/gettext/gettext.patch Tue Aug 28 18:54:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -Index: gettext-runtime/intl/plural-exp.c ---- gettext-runtime/intl/plural-exp.c.orig 2009-06-28 21:44:04.000000000 +0200 -+++ gettext-runtime/intl/plural-exp.c 2010-05-10 08:51:14.000000000 +0200 -@@ -27,7 +27,7 @@ - - #include "plural-exp.h" - --#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \ -+#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1) && !defined __cplusplus) \ - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) - - /* These structs are the constant expression for the germanic plural -Index: gettext-tools/gnulib-lib/execute.c ---- gettext-tools/gnulib-lib/execute.c.orig 2010-02-16 22:32:17.000000000 +0100 -+++ gettext-tools/gnulib-lib/execute.c 2010-05-10 20:22:18.000000000 +0200 -@@ -200,6 +200,9 @@ - subprocess to exit with return code 127. It is implementation - dependent which error is reported which way. We treat both cases as - equivalent. */ -+#ifndef HAVE_ENVIRON_DECL -+ extern char **environ; -+#endif - sigset_t blocked_signals; - posix_spawn_file_actions_t actions; - bool actions_allocated; diff -r c1ab501b4751 -r 7a6617235946 gettext/gettext.spec --- a/gettext/gettext.spec Tue Aug 28 18:54:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ -## -## gettext.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. -## -## Permission to use, copy, modify, and distribute this software for -## any purpose with or without fee is hereby granted, provided that -## the above copyright notice and this permission notice appear in all -## copies. -## -## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## - -# package information -Name: gettext -Summary: GNU National Language Support (NLS) Toolkit -URL: http://www.gnu.org/software/gettext/ -Vendor: Free Software Foundation -Packager: OpenPKG Foundation e.V. -Distribution: OpenPKG Community -Class: BASE -Group: Charset -License: GPL -Version: 0.18.1.1 -Release: 20101020 - -# list of sources -Source0: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz -Patch0: gettext.patch - -# build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, automake -PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: libiconv -PreReq: libiconv - -%description - Gettext is the GNU toolkit for National Language Support (NLS). - -%track - prog gettext = { - version = %{version} - url = ftp://ftp.gnu.org/gnu/gettext/ - regex = gettext-(__VER__)\.tar\.gz - } - -%prep - %setup -q - %patch -p0 - -%build - # strip Automake version numbers from binaries - %{l_shtool} subst \ - -e 's;-${am__api_version};;g' \ - `find . -name configure -print` - - # remove part that conflicts with libiconv - %{l_shtool} subst \ - -e '/localcharset.\$lo/d' \ - gettext-runtime/intl/Makefile.in - %{l_shtool} subst \ - -e 's;\(SUBDIRS.*=.*\)intl-java ;\1;' \ - -e 's;\(SUBDIRS.*=.*\)intl-csharp ;\1;' \ - gettext-runtime/Makefile.in - %{l_shtool} subst \ - -e 's;^.*intl-java/Makefile.*$;;' \ - -e 's;^.*intl-csharp/Makefile.*$;;' \ - gettext-runtime/configure - - # disable a few parts from building - %{l_shtool} subst \ - -e 's;@BUILDJAVA@;no;g' \ - -e 's;@BUILDJAVAEXE@;no;g' \ - -e 's;@BUILDCSHARP@;no;g' \ - gettext-tools/src/Makefile.in - %{l_shtool} subst \ - -e 's;^\(SUBDIRS =.*\)tests gnulib-tests examples;\1;' \ - gettext-tools/Makefile.in - %{l_shtool} subst \ - -e 's;\#if USEJEXE;#ifdef USEJEXE;' \ - gettext-tools/src/read-java.c \ - gettext-tools/src/urlget.c - - # configure toolkit - CC="%{l_cc}" \ - CFLAGS="%{l_cflags -O}" \ - CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags}" \ - GREP="grep" \ - ./configure \ - --prefix=%{l_prefix} \ - --datarootdir=%{l_prefix}/share \ - --mandir=%{l_prefix}/man \ - --infodir=%{l_prefix}/info \ - --with-libiconv-prefix=%{l_prefix} \ - --with-included-gettext \ - --without-libexpat-prefix \ - --disable-libasprintf \ - --disable-csharp \ - --disable-java \ - --disable-shared - - # build toolkit - %{l_make} %{l_mflags} - -%install - rm -rf $RPM_BUILD_ROOT - - # install toolkit - %{l_make} %{l_mflags} install \ - AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \ - DESTDIR=$RPM_BUILD_ROOT - - # strip down installation - rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias - rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gettext/projects - rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale - rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc - rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/xemacs - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libgettext*.la - strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true - - # determine installation files - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} - -%files -f files - -%clean - rm -rf $RPM_BUILD_ROOT -