- updated to 0.22.5

[packages/gettext.git] / gettext.spec

diff --git a/gettext.spec b/gettext.spec
index 6de9bd28f4905b5548e291ba5b260b5b27faa192..0e9ac26dbe5f6f5c133d6525a204b550c602dc36 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,26 +1,31 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without asprintf        # without libasprintf C++ library
-%bcond_without xemacs          # without po-mode for xemacs
-%bcond_without gcj             # with Java support by gcj (preferred over javac)
-%bcond_with    javac           # with Java support by some javac
-%bcond_without dotnet          # without .NET support
-%bcond_with    bootstrap
-#
-
-%{?with_dotnet:%include        /usr/lib/rpm/macros.mono}
-
-%ifnarch %{ix86} %{x8664} arm hppa ppc s390 s390x
+%bcond_without asprintf        # libasprintf C++ library
+%bcond_with    xemacs          # po-mode for xemacs
+%bcond_without java            # convenience bcond to disable Java (any)
+%bcond_with    gcj             # Java support by gcj (preferred over javac)
+%bcond_without javac           # Java support by some javac
+%bcond_without dotnet          # .NET support package
+%bcond_with    bootstrap       # no system GLib, libcroco, libxml2 (for bootstrap)
+
+%ifnarch %{ix86} %{x8664} %{arm} hppa ppc s390 s390x

 %undefine with_dotnet
 %endif
 %ifarch i386
 # plain i386 is not supported; mono uses cmpxchg/xadd which require i486
 %undefine with_dotnet
 %endif
 %undefine with_dotnet
 %endif
 %ifarch i386
 # plain i386 is not supported; mono uses cmpxchg/xadd which require i486
 %undefine with_dotnet
 %endif

-
-%undefine with_xemacs
+%if %{with javac}
+%undefine with_gcj
+%{?use_default_jdk}
+%endif
+%if %{without java}
+%undefine with_gcj
+%undefine with_javac
+%endif

 
 %define build_java     %{?with_gcj:1}%{!?with_gcj:%{?with_javac:1}%{!?with_javac:0}}
 
 %define build_java     %{?with_gcj:1}%{!?with_gcj:%{?with_javac:1}%{!?with_javac:0}}

+%define        build_javaexe   %{?with_gcj:1}%{!?with_gcj:0}

 Summary:       Utilties for program national language support
 Summary(de.UTF-8):     Utilities zum Programmieren von nationaler Sprachunterstützung
 Summary(es.UTF-8):     Utilitarios para el programa de soporte a lenguas locales
 Summary:       Utilties for program national language support
 Summary(de.UTF-8):     Utilities zum Programmieren von nationaler Sprachunterstützung
 Summary(es.UTF-8):     Utilitarios para el programa de soporte a lenguas locales


@@ -32,34 +37,49 @@ 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.17
+Version:       0.22.5

 Release:       1
 Release:       1

-License:       LGPL v2+ (libintl), GPL v3+ (tools)
+License:       LGPL v2.1+ (libintl), GPL v3+ (tools)

 Group:         Development/Tools
 Group:         Development/Tools

-Source0:       ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5: 58a2bc6d39c0ba57823034d55d65d606
+Source0:       https://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.lz
+# Source0-md5: d82550b0c72b2bf175b682d27c7565fc

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

-Patch2:                %{name}-pl.po-update.patch
-Patch3:                %{name}-no_docs.patch
-Patch4:                %{name}-libintl_by_gcj.patch
+Patch3:                %{name}-libdir.patch

 URL:           http://www.gnu.org/software/gettext/
 URL:           http://www.gnu.org/software/gettext/

-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.10
-%{?with_gcj:BuildRequires:     gcj >= 3.0}
-%{?with_javac:BuildRequires:   jdk >= 1.1}
-%if "%(%{__cc} -dumpversion | grep -q '^4.[2-9]' ; echo $?)" == "0"
+BuildRequires: acl-devel
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.13
+%{?with_gcj:BuildRequires:     gcc-java >= 3.0}
+%{!?with_bootstrap:BuildRequires:      glib2-devel >= 2.0}
+%{?with_gcj:BuildRequires:     jar}
+%{?with_javac:%buildrequires_jdk}
+%{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}
+%if "%{cc_version}" >= "4.2"

 BuildRequires: libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}
 BuildRequires: libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}

-BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: libtool >= 2:2
+BuildRequires: libunistring-devel
+%{!?with_bootstrap:BuildRequires:      libxml2-devel}
+BuildRequires: lzip

 %{?with_dotnet:BuildRequires:  mono-csharp}
 %{?with_dotnet:BuildRequires:  mono-csharp}

+BuildRequires: ncurses-devel
+%{?with_java:BuildRequires:    rpm-javaprov}
+BuildRequires: rpmbuild(macros) >= 2.021
+BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22

 BuildRequires: texinfo
 %{?with_xemacs:BuildRequires:  xemacs}
 Obsoletes:     gettext-base
 Conflicts:     intltool < 0.28
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: texinfo
 %{?with_xemacs:BuildRequires:  xemacs}
 Obsoletes:     gettext-base
 Conflicts:     intltool < 0.28
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+# adjust -f when needed (e.g. 0.18.3.x used ABI 0.18.3, 0.19.5.x uses full version)
+%define                intabi  %(echo %{version} | cut -d. -f1-3)
+# similarly for its data
+%define                dataver %(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


@@ -130,7 +150,7 @@ yöntemdir.
 для створення, використання та модифікації каталогів національних мов.
 Це простий та потужний метод для інтернаціоналізації програм.
 
 для створення, використання та модифікації каталогів національних мов.
 Це простий та потужний метод для інтернаціоналізації програм.
 

-%package devel
+%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:       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


@@ -139,19 +159,61 @@ Summary(tr.UTF-8):        Desteği için kitaplık ve araçlar
 License:       GPL v3+
 Group:         Development/Tools
 Requires(post,postun): /sbin/ldconfig
 License:       GPL v3+
 Group:         Development/Tools
 Requires(post,postun): /sbin/ldconfig

-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}

 Requires:      iconv
 Conflicts:     autoconf < 2.52
 Requires:      iconv
 Conflicts:     autoconf < 2.52

+Conflicts:     rpm-build-macros < 1.744
+
+%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
+Group:         Documentation
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description demo
+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
+# relaxed to allow newer package from libtextstyle.spec
+Requires:      libtextstyle >= %{version}-%{release}
+
+%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:       Development files for gettext libraries
+Summary(pl.UTF-8):     Pliki programistyczne bibliotek gettexta
+License:       GPL v3+
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+# relaxed to allow newer package from libtextstyle.spec
+Requires:      libtextstyle-devel >= %{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


@@ -171,7 +233,7 @@ Ten pakiet zawiera statyczne wersje bibliotek narzędziowych gettext
 %package -n libasprintf
 Summary:       GNU libasprintf - automatic formatted output to strings in C++
 Summary(pl.UTF-8):     GNU libasprintf - automatyczne formatowanie wyjścia do łańcuchów w C++
 %package -n libasprintf
 Summary:       GNU libasprintf - automatic formatted output to strings in C++
 Summary(pl.UTF-8):     GNU libasprintf - automatyczne formatowanie wyjścia do łańcuchów w C++

-License:       LGPL v2+
+License:       LGPL v2.1+

 Group:         Libraries
 
 %description -n libasprintf
 Group:         Libraries
 
 %description -n libasprintf


@@ -187,7 +249,7 @@ używalnymi w programach w C++, z łańcuchami <string> i strumieniami
 %package -n libasprintf-devel
 Summary:       Header file and documentation for libasprintf
 Summary(pl.UTF-8):     Plik nagłówkowy i dokumentacja dla libasprintf
 %package -n libasprintf-devel
 Summary:       Header file and documentation for libasprintf
 Summary(pl.UTF-8):     Plik nagłówkowy i dokumentacja dla libasprintf

-License:       LGPL v2+
+License:       LGPL v2.1+

 Group:         Development/Libraries
 Requires:      libasprintf = %{version}-%{release}
 
 Group:         Development/Libraries
 Requires:      libasprintf = %{version}-%{release}
 


@@ -200,7 +262,7 @@ Plik nagłówkowy i dokumentacja dla libasprintf.
 %package -n libasprintf-static
 Summary:       Static libasprintf library
 Summary(pl.UTF-8):     Statyczna biblioteka libasprintf
 %package -n libasprintf-static
 Summary:       Static libasprintf library
 Summary(pl.UTF-8):     Statyczna biblioteka libasprintf

-License:       LGPL v2+
+License:       LGPL v2.1+

 Group:         Development/Libraries
 Requires:      libasprintf-devel = %{version}-%{release}
 
 Group:         Development/Libraries
 Requires:      libasprintf-devel = %{version}-%{release}
 


@@ -210,10 +272,59 @@ Static libasprintf library.
 %description -n libasprintf-static -l pl.UTF-8
 Statyczna biblioteka libasprintf.
 
 %description -n libasprintf-static -l pl.UTF-8
 Statyczna biblioteka libasprintf.
 

+%package -n libtextstyle
+Summary:       GNU libtextstyle - Text styling library
+Summary(pl.UTF-8):     GNU libtextstyle - biblioteka do obsługi stylu tekstu
+License:       GPL v3+
+
+%description -n libtextstyle
+This library provides an easy way to add styling to programs that
+produce output to a console or terminal emulator window.
+
+libtextstyle is for you if your application produces text that is more
+readable when it is accompanied with styling information, such as
+color, font attributes (weight, posture), or underlining.
+
+%description -n libtextstyle -l pl.UTF-8
+Ta biblioteka zapewnia łatwy sposób dodawania styli do programów
+produkujących wyjście na konsoli lub w oknie emulatora terminala.
+
+libtextstyle ma zastosowanie tam, gdzie aplikacja produkuje tekst,
+który jest bardziej czytelny, jeśli jest wzbogacony o informacje o
+stylu, takie jak kolor, atrybuty czcionek (grubość, nachylenie) lub
+podkreślenie.
+
+%package -n libtextstyle-devel
+Summary:       Header files for libtextstyle library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libtextstyle
+License:       GPL v3+
+Group:         Development/Libraries
+Requires:      libtextstyle = %{version}-%{release}
+Requires:      ncurses-devel
+
+%description -n libtextstyle-devel
+Header files for libtextstyle library.
+
+%description -n libtextstyle-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libtextstyle.
+
+%package -n libtextstyle-static
+Summary:       Static libtextstyle library
+Summary(pl.UTF-8):     Statyczna biblioteka libtextstyle
+License:       GPL v3+
+Group:         Development/Libraries
+Requires:      libtextstyle-devel = %{version}-%{release}
+
+%description -n libtextstyle-static
+Static libtextstyle library.
+
+%description -n libtextstyle-static -l pl.UTF-8
+Statyczna biblioteka libtextstyle.
+

 %package java
 Summary:       Runtime classes for Java programs internationalization
 Summary(pl.UTF-8):     Klasy do uruchamiania umiędzynarodowionych programów w Javie
 %package java
 Summary:       Runtime classes for Java programs internationalization
 Summary(pl.UTF-8):     Klasy do uruchamiania umiędzynarodowionych programów w Javie

-License:       LGPL v2+
+License:       LGPL v2.1+

 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 


@@ -268,7 +379,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:      cvs
+Requires:      xz

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


@@ -288,7 +399,7 @@ wersji.
 %package -n dotnet-gettext
 Summary:       GNU gettext for C#
 Summary(pl.UTF-8):     GNU gettext dla C#
 %package -n dotnet-gettext
 Summary:       GNU gettext for C#
 Summary(pl.UTF-8):     GNU gettext dla C#

-License:       LGPL v2+ (GNU.Gettext library), GPL v3+ (tools)
+License:       LGPL v2.1+ (GNU.Gettext library), GPL v3+ (tools)

 Group:         Development/Tools
 
 %description -n dotnet-gettext
 Group:         Development/Tools
 
 %description -n dotnet-gettext


@@ -301,42 +412,66 @@ GNU gettext dla C#.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

-%patch2 -p1
-# patch not finished yet
-#%patch3 -p1
-%patch4 -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
+
+%if %{without bootstrap}
+%{__sed} -i -e '/gl_LIBCROCO\|gl_LIBGLIB\|gl_LIBXML/s/(\[yes\])//' libtextstyle/gnulib-m4/gnulib-comp.m4
+%endif

 
 %build
 
 %build

+cd gettext-runtime

 %{__libtoolize}
 %{__libtoolize}

-cd autoconf-lib-link
-%{__aclocal} -I m4 -I ../m4
+%{__aclocal} -I m4 -I ../m4 -I gnulib-m4

 %{__autoconf}
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %{__automake}

-cd ../gettext-runtime
-%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+cd libasprintf
+%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4

 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd libasprintf
-%{__aclocal} -I ../m4 -I ../../m4
+cd ../../libtextstyle
+%{__libtoolize}
+%{__aclocal} -I m4 -I gnulib-m4

 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd ../../gettext-tools
-%{__aclocal} -I m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../gettext-runtime/m4 -I ../m4
+cd ../gettext-tools
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4

 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd ..
-%{__aclocal}
+cd examples
+%{__aclocal} -I ../../gettext-runtime/m4 -I ../../m4
+%{__autoconf}
+%{__automake}
+cd ../..
+%{__aclocal} -I m4

 %{__autoconf}
 %{__automake}
 %configure \
 %{__autoconf}
 %{__automake}
 %configure \

+       %{!?with_gcj:GCJ=none} \
+        %{?with_javac:JAVA="%{java_home}/bin/java" JAVAC="%{java_home}/bin/javac" JAR="%{java_home}/bin/jar"} \

        %{?with_xemacs:--with-lispdir=%{_datadir}/xemacs-packages/lisp/po-mode} \
        %{?with_xemacs:--with-lispdir=%{_datadir}/xemacs-packages/lisp/po-mode} \

+       %{!?with_xemacs:--without-emacs} \
+       --enable-csharp=%{?with_dotnet:mono}%{!?with_dotnet:no} \
+%if !%{build_java}
+       --disable-java \
+%endif

        --enable-nls \
        --enable-nls \

-       %{!?with_dotnet:--disable-csharp} \
-       %{?with_dotnet:--enable-csharp=mono} \
-       --without-included-gettext
+       --disable-silent-rules \
+       --without-bzip2 \
+       --without-git \
+       --without-included-gettext \
+       --with-xz

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


@@ -353,18 +488,23 @@ EMACS=%{_bindir}/xemacs ./elisp-comp ./po-mode.el
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT/bin
+install -d $RPM_BUILD_ROOT{/bin,%{_datadir}/gettext/its}

 
 %{__make} install \
 
 %{__make} install \

+       examplesdir=%{_examplesdir}/%{name}-%{version} \
+       examplesbuildauxdir=%{_examplesdir}/%{name}-%{version}/build-aux \

        DESTDIR=$RPM_BUILD_ROOT
 
        DESTDIR=$RPM_BUILD_ROOT
 

-mv -f $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin

 
 # these static libs are removed in install-exec-clean
 
 # these static libs are removed in install-exec-clean

-install gettext-tools/gnulib-lib/.libs/libgettextlib.a \
+cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \

        gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 
        gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 

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

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


@@ -372,63 +512,93 @@ rm -r $RPM_BUILD_ROOT%{_docdir}/gettext
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 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
+%post  tools -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        tools -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}

 
 

-%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  devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}

 
 %post  -n libasprintf -p /sbin/ldconfig
 %postun        -n libasprintf -p /sbin/ldconfig
 
 
 %post  -n libasprintf -p /sbin/ldconfig
 %postun        -n libasprintf -p /sbin/ldconfig
 

-%post -n libasprintf-devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post  -n libasprintf-devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        -n libasprintf-devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%post  -n libtextstyle -p /sbin/ldconfig
+%postun        -n libtextstyle -p /sbin/ldconfig

 
 

-%postun -n libasprintf-devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post  -n libtextstyle-devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        -n libtextstyle-devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}

 
 %files -f %{name}-runtime.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}-runtime.lang
 %defattr(644,root,root,755)

-%attr(755,root,root) /bin/*
+%attr(755,root,root) /bin/gettext
+%attr(755,root,root) /bin/ngettext

 %attr(755,root,root) %{_bindir}/envsubst
 %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 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}/*
-%exclude %{_bindir}/autopoint
-%exclude %{_bindir}/envsubst
-%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) %{_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}/preloadable_libintl.so
 %attr(755,root,root) %{_libdir}/preloadable_libintl.so

+%attr(755,root,root) %{_libdir}/gettext/cldr-plurals

 %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}/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}/*
-%{_infodir}/gettext*.info*
+%{_aclocaldir}/build-to-host.m4
+%{_aclocaldir}/gettext.m4
+%{_aclocaldir}/host-cpu-c-abi.m4
+%{_aclocaldir}/iconv.m4
+%{_aclocaldir}/intlmacosx.m4
+%{_aclocaldir}/lib-ld.m4
+%{_aclocaldir}/lib-link.m4
+%{_aclocaldir}/lib-prefix.m4
+%{_aclocaldir}/nls.m4
+%{_aclocaldir}/po.m4
+%{_aclocaldir}/progtest.m4
+%{_infodir}/gettext.info*

 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
 %{_mandir}/man1/recode-sr-latin.1*
 %{_mandir}/man1/xgettext.1*
 %{_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

-%dir %{_datadir}/gettext/intl
-%{_datadir}/gettext/intl/[!c]*
-%attr(755,root,root) %{_datadir}/gettext/intl/config.charset
+%dir %{_datadir}/gettext/its

 %{_datadir}/gettext/msgunfmt.tcl
 %{_datadir}/gettext/po
 %dir %{_datadir}/gettext/projects
 %{_datadir}/gettext/msgunfmt.tcl
 %{_datadir}/gettext/po
 %dir %{_datadir}/gettext/projects


@@ -447,16 +617,42 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/team-address
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
 %{_datadir}/gettext/styles
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/team-address
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
 %{_datadir}/gettext/styles

+%dir %{_datadir}/gettext-%{dataver}
+%{_datadir}/gettext-%{dataver}/its
+
+%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
 %defattr(644,root,root,755)
 %doc gettext-runtime/libasprintf/{AUTHORS,ChangeLog,README}
 %attr(755,root,root) %{_libdir}/libasprintf.so.*.*.*
 
 %if %{with asprintf}
 %files -n libasprintf
 %defattr(644,root,root,755)
 %doc gettext-runtime/libasprintf/{AUTHORS,ChangeLog,README}
 %attr(755,root,root) %{_libdir}/libasprintf.so.*.*.*

+%attr(755,root,root) %ghost %{_libdir}/libasprintf.so.0

 
 %files -n libasprintf-devel
 %defattr(644,root,root,755)
 
 %files -n libasprintf-devel
 %defattr(644,root,root,755)


@@ -470,6 +666,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libasprintf.a
 %endif
 
 %{_libdir}/libasprintf.a
 %endif
 

+%files -n libtextstyle
+%defattr(644,root,root,755)
+%doc libtextstyle/{AUTHORS,NEWS,README}
+%attr(755,root,root) %{_libdir}/libtextstyle.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtextstyle.so.0
+
+%files -n libtextstyle-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libtextstyle.so
+%{_libdir}/libtextstyle.la
+%{_includedir}/textstyle.h
+%{_includedir}/textstyle
+%{_infodir}/libtextstyle.info*
+
+%files -n libtextstyle-static
+%defattr(644,root,root,755)
+%{_libdir}/libtextstyle.a
+

 %if %{build_java}
 %files java
 %defattr(644,root,root,755)
 %if %{build_java}
 %files java
 %defattr(644,root,root,755)


@@ -478,8 +692,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 %{build_javaexe}

 %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
 


@@ -493,7 +711,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.tar.gz
+%{_datadir}/gettext/archive.dir.tar.xz

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