X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gettext.spec;h=7777724636d041cd93cd751021b875e768285ef1;hb=a178a5e405e394d2c1b9a61133fdeb15689f6be1;hp=07b5433806e56687c1d7ffef3f12f19db63c2031;hpb=667db4dd28671aff24d02303882577e982b968ad;p=packages%2Fgettext.git

diff --git a/gettext.spec b/gettext.spec
index 07b5433..7777724 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -9,14 +9,12 @@
 #
 # Conditional build:
 %bcond_without	asprintf	# without libasprintf C++ library
-%bcond_without	xemacs		# without po-mode for xemacs
+%bcond_with		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_with		javac		# with Java support by some javac
 %bcond_without	dotnet		# without .NET support
 %bcond_with	bootstrap	# use system GLib and libcroco
 
-%{?with_dotnet:%include	/usr/lib/rpm/macros.mono}
-
 %ifnarch %{ix86} %{x8664} arm hppa ppc s390 s390x
 %undefine with_dotnet
 %endif
@@ -25,7 +23,7 @@
 %undefine with_dotnet
 %endif
 
-%undefine with_xemacs
+%{?with_dotnet:%include	/usr/lib/rpm/macros.mono}
 
 %define build_java	%{?with_gcj:1}%{!?with_gcj:%{?with_javac:1}%{!?with_javac:0}}
 Summary:	Utilties for program national language support
@@ -40,7 +38,7 @@ Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):	Бібліотеки та утиліти для підтримки національних мов
 Name:		gettext
 Version:	0.17
-Release:	3
+Release:	10
 License:	LGPL v2+ (libintl), GPL v3+ (tools)
 Group:		Development/Tools
 Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -51,12 +49,19 @@ Patch2:		%{name}-pl.po-update.patch
 Patch3:		%{name}-no_docs.patch
 Patch4:		%{name}-libintl_by_gcj.patch
 Patch5:		%{name}-removed_macros.patch
+Patch6:		%{name}-creat_mode.patch
+Patch7:		%{name}-cvs.patch
+Patch8:		%{name}-m4.patch
 URL:		http://www.gnu.org/software/gettext/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
+BuildRequires:	cvs-gnu-client
 %{?with_gcj:BuildRequires:	gcj >= 3.0}
 %{!?with_bootstrap:BuildRequires:	glib2-devel >= 2.0}
-%{?with_javac:BuildRequires:	jdk >= 1.1}
+%if %{with javac}
+BuildRequires:	jdk >= 1.1
+BuildRequires:	jar
+%endif
 %{!?with_bootstrap:BuildRequires:	libcroco-devel >= 0.6.1}
 %if "%(echo %{cc_version} | grep -q '^4.[2-9]'; echo $?)" == "0"
 BuildRequires:	libgomp-devel
@@ -279,7 +284,6 @@ Summary(pl.UTF-8):	Zamiennik gettextize
 License:	GPL v3+
 Group:		Development/Tools
 Requires:	%{name}-devel >= 0.10.35
-Requires:	cvs-client
 
 %description autopoint
 The `autopoint' program copies standard gettext infrastructure files
@@ -317,8 +321,25 @@ GNU gettext dla C#.
 #%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -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 autoconf-lib-link
 %{__aclocal} -I m4 -I ../m4
@@ -379,6 +400,9 @@ mv -f $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin
 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
@@ -512,7 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 %files autopoint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/autopoint
-%{_datadir}/gettext/archive.tar.gz
+%{_datadir}/gettext/archive*.tar.gz
 %{_mandir}/man1/autopoint.1*
 
 %if %{with dotnet}