packages: gettext/gettext.spec, gettext/gettext-pl.po-update.patch (REMOVED...

[qboosh]

Author: qboosh                       Date: Sun Jun 13 20:50:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.18.1.1
- removed obsolete pl.po-update patch
- cvs no longer buildrequired; build autopoint not depending on cvs/git

---- Files affected:
packages/gettext:
   gettext.spec (1.173 -> 1.174) , gettext-pl.po-update.patch (1.12 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/gettext/gettext.spec
diff -u packages/gettext/gettext.spec:1.173 packages/gettext/gettext.spec:1.174
--- packages/gettext/gettext.spec:1.173	Sat Jun  5 19:37:44 2010
+++ packages/gettext/gettext.spec	Sun Jun 13 22:50:49 2010
@@ -38,21 +38,19 @@
 Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):	Бібліотеки та утиліти для підтримки національних мов
 Name:		gettext
-Version:	0.18
+Version:	0.18.1.1
 Release:	0.1
 License:	LGPL v2+ (libintl), GPL v3+ (tools)
 Group:		Development/Tools
 Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5:	d52a3e061032a1ed13856d42fc86f0fd
+# Source0-md5:	3dd55b952826d2b32f51308f2f91aa89
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-killkillkill.patch
-Patch2:		%{name}-pl.po-update.patch
-Patch3:		%{name}-pl.po-fixes.patch
-Patch4:		%{name}-libintl_by_gcj.patch
+Patch2:		%{name}-pl.po-fixes.patch
+Patch3:		%{name}-libintl_by_gcj.patch
 URL:		http://www.gnu.org/software/gettext/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	cvs-client
 %{?with_gcj:BuildRequires:	gcj >= 3.0}
 %{!?with_bootstrap:BuildRequires:	glib2-devel >= 2.0}
 %if %{build_java}
@@ -315,29 +313,14 @@
 %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
+#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
 
 %build
-## make autopoint to use tar.gz archives instead of cvs repository
-#install -d archive-cvs/{prepare,archive}
-#tar xzf gettext-tools/misc/archive.tar.gz -C archive-cvs/prepare
-#cvs -d$(pwd)/archive-cvs/prepare/archive init
-#cd archive-cvs/archive
-#cvs -Q -d$(pwd)/../prepare/archive -q co .
-#for rev in $(cvs status -v | grep '(revision:' | awk ' { print $1 } ' | sort -u); do
-#	cvs -Q up -d -r $rev
-#	cd ..
-#	tar czf archive-${rev}.tar.gz archive --exclude=CVS
-#	cd archive
-#done
-#cd ../..
-
 %{__libtoolize}
 cd gettext-runtime
 %{__libtoolize}
@@ -351,7 +334,7 @@
 %{__autoheader}
 %{__automake}
 cd ../../gettext-tools
-%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -364,7 +347,7 @@
 	--enable-nls \
 	%{!?with_dotnet:--disable-csharp} \
 	%{?with_dotnet:--enable-csharp=mono} \
-	--without-cvs \
+	--without-git \
 	--without-included-gettext \
 	%{?with_bootstrap:--with-included-glib} \
 	%{?with_bootstrap:--with-included-libcroco}
@@ -395,9 +378,6 @@
 install gettext-tools/gnulib-lib/.libs/libgettextlib.a \
 	gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 
-#install archive-cvs/archive-*.tar.gz $RPM_BUILD_ROOT%{_datadir}/gettext
-#rm $RPM_BUILD_ROOT%{_datadir}/gettext/archive.tar.gz
-
 rm -r $RPM_BUILD_ROOT%{_docdir}/gettext
 rm -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -551,6 +531,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2010/06/13 20:50:49  qboosh
+- updated to 0.18.1.1
+- removed obsolete pl.po-update patch
+- cvs no longer buildrequired; build autopoint not depending on cvs/git
+
 Revision 1.173  2010/06/05 17:37:44  sparky
 - fixed condition used for BR: jar
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gettext/gettext.spec?r1=1.173&r2=1.174&f=u