X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gettext.spec;h=2e23f47f1f3d657fd145915d0dc7aedd03299ef6;hb=565ee0610d7a85a75e670c8aaf6c455fb896c6b0;hp=cc5208770d639cb3b97e4e084d8211a9cefac978;hpb=a42d8f00ad9c343ce8f3149362e18107c425eee3;p=packages%2Fgettext.git

diff --git a/gettext.spec b/gettext.spec
index cc52087..2e23f47 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -39,21 +39,19 @@ Summary(ru.UTF-8):	Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):	Бібліотеки та утиліти для підтримки національних мов
 Name:		gettext
-Version:	0.18.2.1
-Release:	2
+Version:	0.19.3
+Release:	3
 License:	LGPL v2+ (libintl), GPL v3+ (tools)
 Group:		Development/Tools
-Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5:	034c8103b14654ebd300fadac44d6f14
+Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+# Source0-md5:	092c3f460553ceb4a638ff81d36434c4
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-killkillkill.patch
-Patch2:		%{name}-pl.po-fixes.patch
-Patch3:		%{name}-libintl_by_gcj.patch
-Patch4:		format-security.patch
+Patch2:		%{name}-libintl_by_gcj.patch
 URL:		http://www.gnu.org/software/gettext/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.11
+BuildRequires:	automake >= 1:1.13
 %{?with_gcj:BuildRequires:	gcj >= 3.0}
 %{!?with_bootstrap:BuildRequires:	glib2-devel >= 2.0}
 %if %{build_java}
@@ -65,11 +63,13 @@ BuildRequires:	jar
 BuildRequires:	libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:	libstdc++-devel}
-BuildRequires:	libtool >= 1:1.4.2-9
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libunistring-devel
 BuildRequires:	libxml2-devel
 %{?with_dotnet:BuildRequires:	mono-csharp}
 BuildRequires:	rpmbuild(macros) >= 1.453
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
 BuildRequires:	xz
 %{?with_xemacs:BuildRequires:	xemacs}
@@ -77,6 +77,8 @@ Obsoletes:	gettext-base
 Conflicts:	intltool < 0.28
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		intabi	%(echo %{version} | cut -d. -f1-3)
+
 %description
 The GNU gettext package provides a set of tools and documentation for
 producing multi-lingual messages in programs. Tools include a set of
@@ -147,6 +149,27 @@ yöntemdir.
 для створення, використання та модифікації каталогів національних мов.
 Це простий та потужний метод для інтернаціоналізації програм.
 
+%package tools
+Summary:	Utilties for program national language support
+Summary(de.UTF-8):	Utilities zum Programmieren von nationaler Sprachunterstützung
+Summary(fr.UTF-8):	Utilitaires pour le support de la langue nationnalepar les programmes
+Summary(pl.UTF-8):	Narzędzia dla programów ze wsparciem dla języków narodowych
+Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
+License:	GPL v3+
+Group:		Development/Tools
+Requires(post,postun):	/sbin/ldconfig
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	iconv
+Conflicts:	autoconf < 2.52
+
+%description tools
+This package contains tools for creating and modifying natural
+language catalogs.
+
+%description tools -l pl.UTF-8
+Ten pakiet zawiera narzędzia do tworzenia i modyfikowania katalogów
+z obsługą języków naturalnych.
+
 %package demo
 Summary:	Demo for gettext
 Summary(pl.UTF-8):	Pliki demonstracyjne dla pakietu gettext
@@ -154,33 +177,39 @@ Group:		Documentation
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description demo
-Demonstrations and samples for gettext
+Demonstrations and samples for gettext.
 
 %description demo -l pl.UTF-8
 Pliki demonstracyjne i przykłady dla pakietu gettext.
 
+%package libs
+Summary:	Shared gettext utility libraries
+Summary(pl.UTF-8):	Współdzielone biblioteki narzędziowe gettexta
+License:	GPL v3+
+Group:		Development/Libraries
+
+%description libs
+This package contains shared versions of gettext utility libraries
+(libgettextlib, libgettextsrc and libgettextpo).
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera współdzielone wersje bibliotek narzędziowych
+gettext (libgettextlib, libgettextsrc i libgettextpo).
+
 %package devel
-Summary:	Utilties for program national language support
-Summary(de.UTF-8):	Utilities zum Programmieren von nationaler Sprachunterstützung
-Summary(fr.UTF-8):	Utilitaires pour le support de la langue nationnalepar les programmes
-Summary(pl.UTF-8):	Narzędzia dla programów ze wsparciem dla języków narodowych
-Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
+Summary:	Development files for gettext libraries
+Summary(pl.UTF-8):	Pliki programistyczne bibliotek gettexta
 License:	GPL v3+
-Group:		Development/Tools
-Requires(post,postun):	/sbin/ldconfig
-Requires:	%{name} = %{version}-%{release}
-Requires:	iconv
-Conflicts:	autoconf < 2.52
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+# for transition period (until BR =~ s/gettext-devel/gettext-tools/ in *.spec)
+Requires:	%{name}-tools = %{version}-%{release}
 
 %description devel
-The gettext library provides an easy to use library and tools for
-creating, using, and modifying natural language catalogs. It is a
-powerfull and simple method for internationalizing programs.
+Development files for gettext libraries.
 
 %description devel -l pl.UTF-8
-Pakiet gettext dostarcza narzędzi do tworzenia, używania i modyfikacji
-katalogów języków narodowych. To jest prosta i wydajna metoda
-lokalizacji (internacjonalizacji) programów.
+Pliki programistyczne bibliotek gettexta.
 
 %package static
 Summary:	Static gettext utility libraries
@@ -330,13 +359,15 @@ GNU gettext dla C#.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#for d in gettext-runtime gettext-tools gettext-tools/examples ; do
-#	iconv -f iso-8859-2 -t utf-8 ${d}/po/pl.po > ${d}/po/pl.po.utf-8
-#	mv -f ${d}/po/pl.po.utf-8 ${d}/po/pl.po
-#done
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%{__sed} -i \
+	-e 's@m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \
+	configure.ac
+%{__sed} -i \
+	-e 's@m4_esyscmd(\[\.\./build-aux/git-version-gen \.\./\.tarball-version\])@[%{version}]@' \
+	gettext-runtime/configure.ac \
+	gettext-tools/configure.ac
 
 %build
 %{__libtoolize}
@@ -411,13 +442,14 @@ cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \
 rm -rf $RPM_BUILD_ROOT
 
 %post devel
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun devel
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %post	-n libasprintf -p /sbin/ldconfig
 %postun	-n libasprintf -p /sbin/ldconfig
 
@@ -439,29 +471,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gettext
 %dir %{_datadir}/gettext
 
-%files demo
-%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
-
-%files devel -f %{name}-tools.lang
+%files tools
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/gettextize
 %attr(755,root,root) %{_bindir}/msg*
 %attr(755,root,root) %{_bindir}/recode-sr-latin
 %attr(755,root,root) %{_bindir}/xgettext
-%attr(755,root,root) %{_libdir}/libgettext*.so
-%{_libdir}/libgettext*.la
-# libgettextpo is for other programs, not used by gettext tools themselves
-%attr(755,root,root) %{_libdir}/libgettextpo.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgettextpo.so.0
 %attr(755,root,root) %{_libdir}/preloadable_libintl.so
 %attr(755,root,root) %{_libdir}/gettext/hostname
 %attr(755,root,root) %{_libdir}/gettext/project-id
 %attr(755,root,root) %{_libdir}/gettext/urlget
 %attr(755,root,root) %{_libdir}/gettext/user-email
-%{_includedir}/gettext-po.h
 %{_aclocaldir}/codeset.m4
+%{_aclocaldir}/extern-inline.m4
 %{_aclocaldir}/fcntl-o.m4
 %{_aclocaldir}/gettext.m4
 %{_aclocaldir}/glibc2.m4
@@ -531,9 +554,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
 %{_datadir}/gettext/styles
 
+%files demo
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
+
+%files libs -f %{name}-tools.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgettextlib-%{intabi}.so
+%attr(755,root,root) %{_libdir}/libgettextsrc-%{intabi}.so
+%attr(755,root,root) %{_libdir}/libgettextpo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgettextpo.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgettextlib.so
+%attr(755,root,root) %{_libdir}/libgettextsrc.so
+%attr(755,root,root) %{_libdir}/libgettextpo.so
+%{_libdir}/libgettextlib.la
+%{_libdir}/libgettextsrc.la
+%{_libdir}/libgettextpo.la
+%{_includedir}/gettext-po.h
+
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgettext*.a
+%{_libdir}/libgettextlib.a
+%{_libdir}/libgettextsrc.a
+%{_libdir}/libgettextpo.a
 
 %if %{with asprintf}
 %files -n libasprintf