- revert massive fsckup

[packages/2UTF.git] / 2UTF.spec

diff --git a/2UTF.spec b/2UTF.spec
index 1268a867103456df893e977ee72f984f02c224ee..7ace176abcb3ffd3ab4393b46704a39247041f6a 100644 (file)
--- a/2UTF.spec
+++ b/2UTF.spec
@@ -2,16 +2,19 @@ Summary:      Translates char-sets and decodes MIME
 Summary(pl):   Translator tablic znaków oraz dekoder MIME
 Name:          2UTF
 Version:       1.22
-Release:       2
+Release:       7
 License:       BSD
 Group:         Applications/Text
+#Source0-md5:  883da4c858570d9d434d23e702304a5a
 Source0:       ftp://sunsite.unc.edu/pub/Linux/utils/text/%{name}-%{version}.tar.gz
 Patch0:                %{name}-makefile.patch
+Patch1:                %{name}-known_charsets_no_tcs.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
+%define                aliasdir        /var/lib/misc
 
 %description
 Filter for char-set translation to and from Unicode. Gets char-set
@@ -27,7 +30,8 @@ wy
 
 %prep
 %setup -q
-%patch -p0
+%patch0 -p0
+%patch1 -p1
 
 %build
 CCFLAGS="%{rpmcflags} -L/usr/lib/gconv"; export CCFLAGS
@@ -39,18 +43,19 @@ LDFLAGS="%{rpmcflags} -L/usr/lib/gconv"; export LDFLAGS
        sysconfdir=%{_sysconfdir} \
        docsdir=%{_docdir}/%{name}-%{version} \
        var_prefix=/var \
-       ALIASES=/var/lib/2UTF.aliases \
+       ALIASES=%{aliasdir}/2UTF.aliases \
        charmaps_localdatadir=%{_datadir}/i18n/charmaps \
        man1dir=%{_mandir}/man1 \
        OPT="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/i18n/charmaps
 %{__make} GZIPDOCS=no \
        PREFIX=$RPM_BUILD_ROOT%{_prefix} \
        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
        var_prefix=$RPM_BUILD_ROOT/var \
-       ALIASES=$RPM_BUILD_ROOT/var/lib/2UTF.aliases \
+       ALIASES=$RPM_BUILD_ROOT%{aliasdir}/2UTF.aliases \
        docsdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
        charmaps_localdatadir=$RPM_BUILD_ROOT%{_datadir}/i18n/charmaps \
        TERMINFO=$RPM_BUILD_ROOT%{_datadir}/terminfo \
@@ -66,9 +71,10 @@ echo ".so 2UTF.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fromUTF.1
 
 ln -sf 2UTF $RPM_BUILD_ROOT%{_bindir}/toUTF
 
-gzip -9nf examples/* BSD_style_license TODO changelog copyright || :
-
 %post
+if [ -f /var/lib/2UTF.aliases ]; then
+       mv -f /var/lib/2UTF.aliases %{aliasdir}/2UTF.aliases
+fi
 %{_bindir}/2UTF --create-aliases
 
 %clean
@@ -76,8 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz examples/*.gz
+%doc examples/* BSD_style_license TODO changelog copyright
 %config %{_sysconfdir}/2UTF.config
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/terminfo/l/*
+%attr(644,root,root) %ghost %{aliasdir}/2UTF.aliases