- missing BRs

[packages/gettext.git] / gettext.spec

diff --git a/gettext.spec b/gettext.spec
index 44985b2e207da99f016ad63a3be875f1df60b5af..628b73b35f30a03eb80e0be38a6ece9d2d283b37 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -5,6 +5,7 @@
 %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}
@@ -31,26 +32,28 @@ 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.16.1
-Release:       5
-License:       LGPL (runtime), GPL (tools)
+Version:       0.17
+Release:       1
+License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 Source0:       ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5: 3d9ad24301c6d6b17ec30704a13fe127
+# Source0-md5: 58a2bc6d39c0ba57823034d55d65d606
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-no_docs.patch
-Patch4:                %{name}-ac.patch
-Patch5:                %{name}-libintl_by_gcj.patch
+Patch4:                %{name}-libintl_by_gcj.patch
+Patch5:                %{name}-removed_macros.patch
 URL:           http://www.gnu.org/software/gettext/
-BuildRequires: autoconf >= 2.59
-# after dropping -ac.patch:
-#BuildRequires:        autoconf >= 2.60
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.10
 %{?with_gcj:BuildRequires:     gcj >= 3.0}
+%{!?with_bootstrap:BuildRequires:      glib2-devel}
 %{?with_javac:BuildRequires:   jdk >= 1.1}
+%{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}
+%if "%(%{__cc} -dumpversion | grep -q '^4.[2-9]' ; echo $?)" == "0"
 BuildRequires: libgomp-devel
+%endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}
 BuildRequires: libtool >= 1:1.4.2-9
 %{?with_dotnet:BuildRequires:  mono-csharp}
@@ -136,7 +139,7 @@ Summary(de.UTF-8):  Utilities zum Programmieren von nationaler Sprachunterstützu
 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
+License:       GPL v3+
 Group:         Development/Tools
 Requires(post,postun): /sbin/ldconfig
 Requires:      %{name} = %{version}-%{release}
@@ -156,7 +159,7 @@ lokalizacji (internacjonalizacji) programów.
 %package static
 Summary:       Static gettext utility libraries
 Summary(pl.UTF-8):     Statyczne biblioteki narzędziowe gettext
-License:       GPL
+License:       GPL v3+
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -171,7 +174,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++
-License:       LGPL
+License:       LGPL v2+
 Group:         Libraries
 
 %description -n libasprintf
@@ -187,7 +190,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
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Libraries
 Requires:      libasprintf = %{version}-%{release}
 
@@ -200,7 +203,7 @@ Plik nagłówkowy i dokumentacja dla libasprintf.
 %package -n libasprintf-static
 Summary:       Static libasprintf library
 Summary(pl.UTF-8):     Statyczna biblioteka libasprintf
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Libraries
 Requires:      libasprintf-devel = %{version}-%{release}
 
@@ -213,7 +216,7 @@ Statyczna biblioteka libasprintf.
 %package java
 Summary:       Runtime classes for Java programs internationalization
 Summary(pl.UTF-8):     Klasy do uruchamiania umiędzynarodowionych programów w Javie
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 
@@ -226,7 +229,7 @@ Klasy do uruchamiania umiędzynarodowionych programów w Javie.
 %package java-devel
 Summary:       Development classes for Java programs internationalization
 Summary(pl.UTF-8):     Klasy do umiędzynarodowiania programów w Javie dla programistów
-License:       GPL
+License:       GPL v3+
 Group:         Development/Tools
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -241,7 +244,7 @@ Summary:    Xemacs PO-mode
 Summary(es.UTF-8):     Facilita la edición de archivos PO (internacionalización) con emacs
 Summary(pl.UTF-8):     Tryb PO dla Xemacsa
 Summary(pt_BR.UTF-8):  Facilita a edição de arquivos PO (internacionalização) com o emacs
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Editors/Emacs
 Requires:      xemacs
 
@@ -265,7 +268,7 @@ para a documentação de uso, a qual não é incluída aqui.
 %package autopoint
 Summary:       gettextize replacement
 Summary(pl.UTF-8):     Zamiennik gettextize
-License:       GPL
+License:       GPL v3+
 Group:         Development/Tools
 Requires:      %{name}-devel >= 0.10.35
 Requires:      cvs
@@ -288,8 +291,10 @@ wersji.
 %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)
 Group:         Development/Tools
 
+
 %description -n dotnet-gettext
 GNU gettext for C#.
 
@@ -306,13 +311,6 @@ GNU gettext dla C#.
 %patch4 -p1
 %patch5 -p1
 
-%{__perl} -pi -e 's/ no / nb /' gettext-runtime/po/LINGUAS gettext-tools/po/LINGUAS
-mv -f gettext-runtime/po/{no,nb}.po
-mv -f gettext-runtime/po/{no,nb}.gmo
-mv -f gettext-tools/po/{no,nb}.po
-mv -f gettext-tools/po/{no,nb}.gmo
-rm -f gettext-tools/po/stamp-po
-
 %build
 %{__libtoolize}
 cd autoconf-lib-link
@@ -343,8 +341,11 @@ cd ..
        --enable-nls \
        %{!?with_dotnet:--disable-csharp} \
        %{?with_dotnet:--enable-csharp=mono} \
-       --without-included-gettext
-%{__make}
+       --without-included-gettext \
+       %{?with_bootstrap:--with-included-glib} \
+       %{?with_bootstrap:--with-included-libcroco}
+%{__make} \
+       GMSGFMT=`pwd`/gettext-tools/src/msgfmt
 
 # msgfmt has been built, so now we can update pl.gmos
 %{__make} pl.gmo -C gettext-runtime/po \
@@ -425,6 +426,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/gettext*.info*
 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
+%{_mandir}/man1/recode-sr-latin.1*
 %{_mandir}/man1/xgettext.1*
 %{_mandir}/man3/*
 
@@ -451,6 +453,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gettext/projects/TP/teams.*
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/team-address
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
+%{_datadir}/gettext/styles
 
 %files static
 %defattr(644,root,root,755)
@@ -484,6 +487,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc gettext-runtime/intl-java/javadoc2
 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.DumpResource
 %attr(755,root,root) %{_libdir}/gettext/gnu.gettext.GetURL
+%{_datadir}/gettext/javaversion.class
 %endif
 
 %if %{with xemacs}