!9 Delete libcroco dependency and bundle it
From: @panxh_purple Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
2ea0ab1da3
18
gettext.spec
18
gettext.spec
@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
Name: gettext
|
Name: gettext
|
||||||
Version: 0.21
|
Version: 0.21
|
||||||
Release: 1
|
Release: 2
|
||||||
License: GPLv3+ and LGPLv2+
|
License: GPLv3+ and LGPLv2+
|
||||||
Summary: GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages.
|
Summary: GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages.
|
||||||
URL: https://www.gnu.org/software/gettext/
|
URL: https://www.gnu.org/software/gettext/
|
||||||
Source: https://ftp.gnu.org/pub/gnu/gettext/%{name}-%{version}.tar.gz
|
Source: https://ftp.gnu.org/pub/gnu/gettext/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
BuildRequires: gcc-c++, emacs, git, xz, chrpath, autoconf
|
BuildRequires: gcc-c++, emacs, git, xz, chrpath, autoconf
|
||||||
BuildRequires: ncurses-devel, libxml2-devel, glib2-devel, libcroco-devel, libunistring-devel
|
BuildRequires: ncurses-devel, libxml2-devel, glib2-devel, libunistring-devel
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
BuildRequires: gcc-java, libgcj
|
BuildRequires: gcc-java, libgcj
|
||||||
BuildRequires: java-1.6.0-openjdk-devel
|
BuildRequires: java-1.6.0-openjdk-devel
|
||||||
@ -26,6 +26,7 @@ BuildRequires: zip, unzip
|
|||||||
Conflicts: filesystem < 3
|
Conflicts: filesystem < 3
|
||||||
Provides: /bin/gettext
|
Provides: /bin/gettext
|
||||||
Provides: bundled(gnulib)
|
Provides: bundled(gnulib)
|
||||||
|
Provides: bundled(libcroco) = 0.6.12
|
||||||
Provides: %{name}-libs
|
Provides: %{name}-libs
|
||||||
Obsoletes: %{name}-libs
|
Obsoletes: %{name}-libs
|
||||||
|
|
||||||
@ -79,8 +80,7 @@ This package contains man, license, info, readme, copyright, license.
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -S git
|
%autosetup -n %{name}-%{version} -S git
|
||||||
|
|
||||||
sed -e 's/\(gl_cv_libcroco_force_included=\)yes/\1no/' \
|
sed -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
|
||||||
-e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
|
|
||||||
-i libtextstyle/configure
|
-i libtextstyle/configure
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -93,8 +93,8 @@ export JAR=fastjar
|
|||||||
%ifarch ppc ppc64 ppc64le
|
%ifarch ppc ppc64 ppc64le
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
|
export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
|
||||||
%endif
|
%endif
|
||||||
export CPPFLAGS="-I$(ls -1d %{_includedir}/libcroco-*/libcroco) -I%{_includedir}/libxml2"
|
export CPPFLAGS="-I%{_includedir}/libxml2"
|
||||||
export LIBS="-lcroco-0.6 -lxml2"
|
export LIBS="-lxml2"
|
||||||
%configure --without-included-gettext --enable-nls --disable-static \
|
%configure --without-included-gettext --enable-nls --disable-static \
|
||||||
--enable-shared --with-pic --disable-csharp --disable-rpath \
|
--enable-shared --with-pic --disable-csharp --disable-rpath \
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
@ -233,6 +233,12 @@ make check LIBUNISTRING=-lunistring
|
|||||||
%exclude %{_mandir}/man1/autopoint.1*
|
%exclude %{_mandir}/man1/autopoint.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 4 2020 panxiaohe<panxiaohe@huawei.com> - 0.21-2
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Delete libcroco dependency and bundle it
|
||||||
|
|
||||||
* Tue Sep 1 2020 wangchen<wangchen137@huawei.com> - 0.21-1
|
* Tue Sep 1 2020 wangchen<wangchen137@huawei.com> - 0.21-1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user