X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=2UTF.spec;h=e0bd603c21f4adc98f3e15f58b4fef27f1e4f793;hb=02e59a537584ae2b26e61c41faa3a8daea267f37;hp=b3d9d44636c7f5dc35c10a5c30aa872acb0c6b82;hpb=4ec06cc11aa6c7a616fa497561e1fbff1f3c75d5;p=packages%2F2UTF.git

diff --git a/2UTF.spec b/2UTF.spec
index b3d9d44..e0bd603 100644
--- a/2UTF.spec
+++ b/2UTF.spec
@@ -1,68 +1,75 @@
-Summary:	Translates char-sets and decodes MIME.
-Summary(pl):	Translator tablic znaków oraz dekoder MIME.
+Summary:	Translates char-sets and decodes MIME
+Summary(pl):	Translator tablic znaków oraz dekoder MIME
 Name:		2UTF
-Version:	1.10
+Version:	1.22
 Release:	1
-Copyright:	BSD
-Group:		Utilities/Text
-Group(pl):	Narzêdzia/Tekst
-Source:		ftp://sunsite.unc.edu/pub/Linux/utils/text/%{name}-%{version}.tar.gz
-Patch:		2UTF-install.patch
-URL:		http://www.angelfire.com/me/rch/ll.html#2UTF
-BuildRoot:	/tmp/%{name}-%{version}-root
+License:	BSD
+Group:		Applications/Text
+Group(de):	Applikationen/Text
+Group(fr):	Utilitaires/Texte
+Group(pl):	Aplikacje/Tekst
+Source0:	ftp://sunsite.unc.edu/pub/Linux/utils/text/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
+URL:		http://x-lt.richard.eu.org/me/rch/ll.html
+#URL:		http://www.angelfire.com/me/rch/ll.html#2UTF
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_sysconfdir	/etc
 
 %description
-Filter for char-set translation to and from Unicode.
-Gets char-set definitions from WG15 locales char-maps or similiar tables.
-Can decode nested multi-part MIME messages and invoke external filters.
-Can display char-maps and current console font.  
+Filter for char-set translation to and from Unicode. Gets char-set
+definitions from WG15 locales char-maps or similiar tables. Can decode
+nested multi-part MIME messages and invoke external filters. Can
+display char-maps and current console font.
 
 %description -l pl
-Translator tablic znaków do i z Unikodu.
-Pobiera definicje tablic znaków z lokalnych WG15 tablic znaków lub podobnych.
-Mo¿e zdekodowaæ wiadomo¶ci wieloczê¶ciowe MIME i uruchomiæ zewnêtrzne filtry.
-Mo¿e wy¶wietlaæ tablice znaków i aktualny font konsolowy.
+Translator tablic znaków do i z Unikodu. Pobiera definicje tablic
+znaków z lokalnych WG15 tablic znaków lub podobnych. Mo¿e zdekodowaæ
+wiadomo¶ci wieloczê¶ciowe MIME i uruchamiaæ zewnêtrzne filtry. Mo¿e
+wy¶wietlaæ tablice znaków i aktualny font konsolowy.
 
 %prep
 %setup -q
 %patch -p0
 
 %build
-make config
-make GZIPDOCS=no \
+CCFLAGS="%{rpmcflags} -L/usr/lib/gconv"; export CCFLAGS
+%{__make} config ICONV_DIR=%{_prefix}
+LDFLAGS="%{rpmcflags} -L/usr/lib/gconv"; export LDFLAGS
+%{__make} \
+	GZIPDOCS=no \
 	PREFIX=%{_prefix} \
-	sysconfdir=/etc \
+	sysconfdir=%{_sysconfdir} \
 	docsdir=%{_docdir}/%{name}-%{version} \
 	var_prefix=/var \
-	ALIASES=/var/state/2UTF.aliases \
+	ALIASES=/var/lib/2UTF.aliases \
 	charmaps_localdatadir=%{_datadir}/i18n/charmaps \
 	man1dir=%{_mandir}/man1 \
-	OPT="$RPM_OPT_FLAGS"
+	OPT="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make GZIPDOCS=no \
-	PREFIX=$RPM_BUILD_ROOT/%{_prefix} \
-	sysconfdir=$RPM_BUILD_ROOT/etc \
+%{__make} GZIPDOCS=no \
+	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
 	var_prefix=$RPM_BUILD_ROOT/var \
-	ALIASES=$RPM_BUILD_ROOT/var/state/2UTF.aliases \
-	docsdir=$RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} \
-	charmaps_localdatadir=$RPM_BUILD_ROOT/%{_datadir}/i18n/charmaps \
-	TERMINFO=$RPM_BUILD_ROOT/%{_datadir}/terminfo \
-	man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \
+	ALIASES=$RPM_BUILD_ROOT/var/lib/2UTF.aliases \
+	docsdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+	charmaps_localdatadir=$RPM_BUILD_ROOT%{_datadir}/i18n/charmaps \
+	TERMINFO=$RPM_BUILD_ROOT%{_datadir}/terminfo \
+	man1dir=$RPM_BUILD_ROOT%{_mandir}/man1 \
 	tmpdir_install=yes \
 	owner=`id -ur` \
 	group=`id -gr` \
 	install
 
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/{fromUTF.1,toUTF.1}
-echo ".so 2UTF.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/toUTF.1
-echo ".so 2UTF.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/fromUTF.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{fromUTF.1,toUTF.1}
+echo ".so 2UTF.1" > $RPM_BUILD_ROOT%{_mandir}/man1/toUTF.1
+echo ".so 2UTF.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fromUTF.1
 
 ln -sf 2UTF $RPM_BUILD_ROOT%{_bindir}/toUTF
 
-gzip -9nf $RPM_BUILD_ROOT/%{_mandir}/man1/* examples/* \
-	BSD_style_license TODO changelog copyright || :
+gzip -9nf examples/* BSD_style_license TODO changelog copyright || :
 
 %post
 %{_bindir}/2UTF --create-aliases
@@ -72,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {BSD_style_license,TODO,changelog,copyright}.gz examples
-%config /etc/2UTF.config
+%doc *.gz examples/*.gz
+%config %{_sysconfdir}/2UTF.config
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/terminfo/l/*