gettext.spec

@@ -2,10 +2,10 @@
 %bcond_with java
 %bcond_without check
 
-%global archiveversion 0.21.1
+%global archiveversion 0.21
 
 Name:    gettext
-Version: 0.21.1
+Version: 0.21
 Release: 1
 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.
@@ -13,7 +13,7 @@ URL:     https://www.gnu.org/software/gettext/
 Source:  https://ftp.gnu.org/pub/gnu/gettext/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc-c++, emacs, git, xz, chrpath, autoconf
-BuildRequires: ncurses-devel, libxml2-devel, glib2-devel, libunistring-devel
+BuildRequires: ncurses-devel, libxml2-devel, glib2-devel, libcroco-devel, libunistring-devel
 %if %{with java}
 BuildRequires: gcc-java, libgcj
 BuildRequires: java-1.6.0-openjdk-devel
@@ -26,9 +26,8 @@ BuildRequires: zip, unzip
 Conflicts: filesystem < 3
 Provides: /bin/gettext
 Provides: bundled(gnulib)
-Provides: bundled(libcroco) = 0.6.12
-Provides: %{name}-libs = %{version}-%{release}
-Obsoletes: %{name}-libs < %{version}-%{release}
+Provides: %{name}-libs
+Obsoletes: %{name}-libs
 
 %description
 GNU gettext is an important step for the GNU Translation Project, as it
@@ -54,10 +53,16 @@ Requires(preun): info
 Requires: xz
 Obsoletes: gettext-autopoint < 0.18.1.1-3
 Provides: gettext-autopoint = %{version}-%{release}
-Obsoletes: %{name}-common-devel < %{version}-%{release}
-Provides: %{name}-common-devel = %{version}-%{release}
-Obsoletes: msghack < %{version}-%{release}
-Provides: msghack = %{version}-%{release}
+Obsoletes: %{name}-common-devel
+Provides: %{name}-common-devel
+Provides: emacs-po-mode
+Requires: emacs(bin) >= %{_emacs_version}
+Provides: emacs-%{name}-el = %{version}-%{release}
+Provides: emacs-%{name}
+Obsoletes: emacs-%{name}
+Obsoletes: emacs-%{name}-el < %{version}-%{release}
+Obsoletes: msghack
+Provides: msghack
 
 %description devel
 This package provides development files and tools which help edit/alter
@@ -65,19 +70,6 @@ po files, if you need to compile gettext related application/library or
 edit/alter po files, you should install this package.
 want to add gettext support for your project.
 
-%package -n emacs-%{name}
-Summary: Support for editing po files within GNU Emacs
-Group: Application/Editors
-BuildArch: noarch
-# help users find po-mode.el
-Provides: emacs-po-mode
-Requires: emacs(bin) >= %{_emacs_version}
-Provides: emacs-%{name}-el = %{version}-%{release}
-Obsoletes: emacs-%{name}-el < %{version}-%{release}
-
-%description -n emacs-%{name}
-This package provides a major mode for editing po files within GUN Emacs
-
 %package help
 Summary: help info for %{name}
 
@@ -87,7 +79,8 @@ This package contains man, license, info, readme, copyright, license.
 %prep
 %autosetup -n %{name}-%{version} -S git
 
-sed -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
+sed -e 's/\(gl_cv_libcroco_force_included=\)yes/\1no/' \
+    -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
     -i libtextstyle/configure
 
 %build
@@ -100,8 +93,8 @@ export JAR=fastjar
 %ifarch ppc ppc64 ppc64le
 export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
 %endif
-export CPPFLAGS="-I%{_includedir}/libxml2"
-export LIBS="-lxml2"
+export CPPFLAGS="-I$(ls -1d %{_includedir}/libcroco-*/libcroco) -I%{_includedir}/libxml2"
+export LIBS="-lcroco-0.6 -lxml2"
 %configure --without-included-gettext --enable-nls --disable-static \
     --enable-shared --with-pic --disable-csharp --disable-rpath \
 %if %{with java}
@@ -226,13 +219,11 @@ make check LIBUNISTRING=-lunistring
 %{_libdir}/%{name}/gnu.gettext.*
 %endif
 %{_datadir}/%{name}/archive.*.tar.xz
-%license COPYING
-
-%files -n emacs-%{name}
 %dir %{_emacs_sitelispdir}/%{name}
 %{_emacs_sitelispdir}/%{name}/*.elc
 %{_emacs_sitelispdir}/%{name}/*.el
 %{_emacs_sitestartdir}/*.el
+%license COPYING
 
 %files help
 %{_infodir}/gettext*
@@ -242,36 +233,6 @@ make check LIBUNISTRING=-lunistring
 %exclude %{_mandir}/man1/autopoint.1*
 
 %changelog
-* Fri Nov 04 2022 fuanan <fuanan3@h-partners.com> - 0.21.1-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update version to 0.21.1
-
-* Fri Sep 9 2022 yixiangzhike<yixiangzhike007@163.com> - 0.21-5
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Add version number for Obsoletes and Provides
-
-* Fri May 14 2021 yangzhuangzhuang<yangzhuangzhuang1@Huawei.com> - 0.21-4
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:detach the sub package emacs-gettext from gettex-devel
-
-* Fri Apr 30 2021 yangzhuangzhuang<yangzhuangzhuang1@Huawei.com> - 0.21-3
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Add version number for Obsoletes: emacs-gettext
-
-* 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
 - Type:enhancement
 - ID:NA