- release 3 (by relup.sh)

[packages/gettext.git] / gettext.spec

diff --git a/gettext.spec b/gettext.spec
index ecac8c92f6b214febf3c098b06a3abfb09441560..2e23f47f1f3d657fd145915d0dc7aedd03299ef6 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -22,7 +22,9 @@
 # plain i386 is not supported; mono uses cmpxchg/xadd which require i486
 %undefine with_dotnet
 %endif
 # plain i386 is not supported; mono uses cmpxchg/xadd which require i486
 %undefine with_dotnet
 %endif

-
+%if %{with javac}
+%undefine with_gcj
+%endif

 %{?with_dotnet:%include        /usr/lib/rpm/macros.mono}
 
 %define build_java     %{?with_gcj:1}%{!?with_gcj:%{?with_javac:1}%{!?with_javac:0}}
 %{?with_dotnet:%include        /usr/lib/rpm/macros.mono}
 
 %define build_java     %{?with_gcj:1}%{!?with_gcj:%{?with_javac:1}%{!?with_javac:0}}


@@ -37,42 +39,46 @@ Summary(ru.UTF-8):  Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):     Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext
 Summary(tr.UTF-8):     Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext

-Version:       0.18.1.1
-Release:       1
+Version:       0.19.3
+Release:       3

 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools

-Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5: 3dd55b952826d2b32f51308f2f91aa89
+Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+# Source0-md5: 092c3f460553ceb4a638ff81d36434c4

 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch

-Patch2:                %{name}-pl.po-fixes.patch
-Patch3:                %{name}-libintl_by_gcj.patch
+Patch2:                %{name}-libintl_by_gcj.patch

 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.62
 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}
 BuildRequires: jar
 %endif
 %{?with_gcj:BuildRequires:     gcj >= 3.0}
 %{!?with_bootstrap:BuildRequires:      glib2-devel >= 2.0}
 %if %{build_java}
 BuildRequires: jar
 %endif

-%{?with_javac:BuildRequires:   jdk >= 1.1}
+%{?with_javac:BuildRequires:   jdk >= 1.3}

 %{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}
 %if "%(echo %{cc_version} | grep -q '^4.[2-9]'; echo $?)" == "0"
 BuildRequires: libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}
 %{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}
 %if "%(echo %{cc_version} | grep -q '^4.[2-9]'; echo $?)" == "0"
 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: 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: texinfo

+BuildRequires: xz

 %{?with_xemacs:BuildRequires:  xemacs}
 Obsoletes:     gettext-base
 Conflicts:     intltool < 0.28
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %{?with_xemacs:BuildRequires:  xemacs}
 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
 %description
 The GNU gettext package provides a set of tools and documentation for
 producing multi-lingual messages in programs. Tools include a set of


@@ -143,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
 %package demo
 Summary:       Demo for gettext
 Summary(pl.UTF-8):     Pliki demonstracyjne dla pakietu gettext


@@ -150,33 +177,39 @@ Group:            Documentation
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description demo
 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.
 
 
 %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
 %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+
 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
 
 %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
 
 %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
 
 %package static
 Summary:       Static gettext utility libraries


@@ -293,6 +326,7 @@ Summary(pl.UTF-8):  Zamiennik gettextize
 License:       GPL v3+
 Group:         Development/Tools
 Requires:      %{name}-devel >= 0.10.35
 License:       GPL v3+
 Group:         Development/Tools
 Requires:      %{name}-devel >= 0.10.35

+Requires:      xz

 
 %description autopoint
 The `autopoint' program copies standard gettext infrastructure files
 
 %description autopoint
 The `autopoint' program copies standard gettext infrastructure files


@@ -325,12 +359,15 @@ GNU gettext dla C#.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %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
 %patch2 -p1

-%patch3 -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}
 
 %build
 %{__libtoolize}


@@ -359,10 +396,12 @@ cd ..
        --enable-nls \
        %{!?with_dotnet:--disable-csharp} \
        %{?with_dotnet:--enable-csharp=mono} \
        --enable-nls \
        %{!?with_dotnet:--disable-csharp} \
        %{?with_dotnet:--enable-csharp=mono} \

+       --without-bzip2 \

        --without-git \
        --without-included-gettext \
        %{?with_bootstrap:--with-included-glib} \
        --without-git \
        --without-included-gettext \
        %{?with_bootstrap:--with-included-glib} \

-       %{?with_bootstrap:--with-included-libcroco}
+       %{?with_bootstrap:--with-included-libcroco} \
+       --with-xz

 %{__make} \
        GMSGFMT=`pwd`/gettext-tools/src/msgfmt
 
 %{__make} \
        GMSGFMT=`pwd`/gettext-tools/src/msgfmt
 


@@ -392,9 +431,9 @@ mv -f $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin
 cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \
        gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 
 cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \
        gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 

-rm -r $RPM_BUILD_ROOT%{_docdir}/gettext
-rm -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gettext
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
+%{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir

 
 %find_lang %{name}-runtime
 %find_lang %{name}-tools
 
 %find_lang %{name}-runtime
 %find_lang %{name}-tools


@@ -403,13 +442,14 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 %post devel
 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
 [ ! -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
 
 [ ! -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
 
 %post  -n libasprintf -p /sbin/ldconfig
 %postun        -n libasprintf -p /sbin/ldconfig
 


@@ -424,43 +464,71 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /bin/gettext
 %attr(755,root,root) /bin/ngettext
 %attr(755,root,root) %{_bindir}/envsubst
 %attr(755,root,root) /bin/gettext
 %attr(755,root,root) /bin/ngettext
 %attr(755,root,root) %{_bindir}/envsubst

+%attr(755,root,root) %{_bindir}/gettext.sh

 %{_mandir}/man1/envsubst.1*
 %{_mandir}/man1/gettext.1*
 %{_mandir}/man1/ngettext.1*
 %dir %{_libdir}/gettext
 %dir %{_datadir}/gettext
 
 %{_mandir}/man1/envsubst.1*
 %{_mandir}/man1/gettext.1*
 %{_mandir}/man1/ngettext.1*
 %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
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS

-%attr(755,root,root) %{_bindir}/gettext.sh

 %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) %{_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
 %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}/*.m4
+%{_aclocaldir}/codeset.m4
+%{_aclocaldir}/extern-inline.m4
+%{_aclocaldir}/fcntl-o.m4
+%{_aclocaldir}/gettext.m4
+%{_aclocaldir}/glibc2.m4
+%{_aclocaldir}/glibc21.m4
+%{_aclocaldir}/iconv.m4
+%{_aclocaldir}/intdiv0.m4
+%{_aclocaldir}/intl.m4
+%{_aclocaldir}/intldir.m4
+%{_aclocaldir}/intlmacosx.m4
+%{_aclocaldir}/intmax.m4
+%{_aclocaldir}/inttypes-pri.m4
+%{_aclocaldir}/inttypes_h.m4
+%{_aclocaldir}/lcmessage.m4
+%{_aclocaldir}/lib-ld.m4
+%{_aclocaldir}/lib-link.m4
+%{_aclocaldir}/lib-prefix.m4
+%{_aclocaldir}/lock.m4
+%{_aclocaldir}/longlong.m4
+%{_aclocaldir}/nls.m4
+%{_aclocaldir}/po.m4
+%{_aclocaldir}/printf-posix.m4
+%{_aclocaldir}/progtest.m4
+%{_aclocaldir}/size_max.m4
+%{_aclocaldir}/stdint_h.m4
+%{_aclocaldir}/threadlib.m4
+%{_aclocaldir}/uintmax_t.m4
+%{_aclocaldir}/visibility.m4
+%{_aclocaldir}/wchar_t.m4
+%{_aclocaldir}/wint_t.m4
+%{_aclocaldir}/xsize.m4

 %{_infodir}/gettext*.info*
 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
 %{_mandir}/man1/recode-sr-latin.1*
 %{_mandir}/man1/xgettext.1*
 %{_infodir}/gettext*.info*
 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
 %{_mandir}/man1/recode-sr-latin.1*
 %{_mandir}/man1/xgettext.1*

-%{_mandir}/man3/*
-
+%{_mandir}/man3/bind_textdomain_codeset.3*
+%{_mandir}/man3/bindtextdomain.3*
+%{_mandir}/man3/dcgettext.3*
+%{_mandir}/man3/dcngettext.3*
+%{_mandir}/man3/dgettext.3*
+%{_mandir}/man3/dngettext.3*
+%{_mandir}/man3/gettext.3*
+%{_mandir}/man3/ngettext.3*
+%{_mandir}/man3/textdomain.3*

 %{_datadir}/gettext/ABOUT-NLS
 %attr(755,root,root) %{_datadir}/gettext/config.rpath
 %{_datadir}/gettext/gettext.h
 %{_datadir}/gettext/ABOUT-NLS
 %attr(755,root,root) %{_datadir}/gettext/config.rpath
 %{_datadir}/gettext/gettext.h


@@ -486,9 +554,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
 %{_datadir}/gettext/styles
 
 %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)
 %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
 
 %if %{with asprintf}
 %files -n libasprintf


@@ -517,8 +608,12 @@ rm -rf $RPM_BUILD_ROOT
 %files java-devel
 %defattr(644,root,root,755)
 %doc gettext-runtime/intl-java/javadoc2
 %files java-devel
 %defattr(644,root,root,755)
 %doc gettext-runtime/intl-java/javadoc2

+%if %{with gcj}

 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.DumpResource
 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.GetURL
 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.DumpResource
 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.GetURL

+%else
+%{_datadir}/gettext/gettext.jar
+%endif

 %{_datadir}/gettext/javaversion.class
 %endif
 
 %{_datadir}/gettext/javaversion.class
 %endif
 


@@ -532,7 +627,7 @@ rm -rf $RPM_BUILD_ROOT
 %files autopoint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/autopoint
 %files autopoint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/autopoint

-%{_datadir}/gettext/archive.dir.tar.gz
+%{_datadir}/gettext/archive.dir.tar.xz

 %{_mandir}/man1/autopoint.1*
 
 %if %{with dotnet}
 %{_mandir}/man1/autopoint.1*
 
 %if %{with dotnet}