Author: qboosh                       Date: Wed Nov  7 21:44:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated info,pl.po-update patches
- dropped ac patch (just BR autoconf 2.60 for topdir AC_SUBST)
- clarified License in subpackages
- BR libgomp-devel only when using gcc 4.2+

---- Files affected:
SPECS:
   gettext.spec (1.145 -> 1.146) 

---- Diffs:

================================================================
Index: SPECS/gettext.spec
diff -u SPECS/gettext.spec:1.145 SPECS/gettext.spec:1.146
--- SPECS/gettext.spec:1.145    Wed Nov  7 09:56:38 2007
+++ SPECS/gettext.spec  Wed Nov  7 22:44:10 2007
@@ -35,7 +35,7 @@
 Name:          gettext
 Version:       0.17
 Release:       0.1
-License:       LGPL (libintl), GPL v3+ (tools)
+License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 Source0:       ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 # Source0-md5: 58a2bc6d39c0ba57823034d55d65d606
@@ -43,16 +43,15 @@
 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
 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_javac:BuildRequires:   jdk >= 1.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}
@@ -138,7 +137,7 @@
 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}
@@ -158,7 +157,7 @@
 %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}
 
@@ -173,7 +172,7 @@
 %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
@@ -189,7 +188,7 @@
 %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}
 
@@ -202,7 +201,7 @@
 %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}
 
@@ -215,7 +214,7 @@
 %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}
 
@@ -228,7 +227,7 @@
 %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}
 
@@ -243,7 +242,7 @@
 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
 
@@ -267,7 +266,7 @@
 %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
@@ -290,6 +289,7 @@
 %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
@@ -300,11 +300,9 @@
 
 %prep
 %setup -q
-# FIXME
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-# FIXME
-#%patch2 -p1
+%patch2 -p1
 # patch not finished yet
 #%patch3 -p1
 %patch4 -p1
@@ -511,6 +509,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2007/11/07 21:44:10  qboosh
+- updated info,pl.po-update patches
+- dropped ac patch (just BR autoconf 2.60 for topdir AC_SUBST)
+- clarified License in subpackages
+- BR libgomp-devel only when using gcc 4.2+
+
 Revision 1.145  2007/11/07 08:56:38  arekm
 - initial 0.17 (info+po patches need update)
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gettext.spec?r1=1.145&r2=1.146&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to