wyczyszczone

Changed files:
    2UTF.spec -> 1.4

diff --git a/2UTF.spec b/2UTF.spec
index 9e28c34ae32e628b6dffc1669b3f7fa6b50ca348..4e96c0aacad199501ddcd50f86f2689042ace57b 100644 (file)
--- a/2UTF.spec
+++ b/2UTF.spec
@@ -1,44 +1,76 @@
-Summary: Translates char-sets and decodes MIME.
-Name: 2UTF
-Version: 1.10
-Release: 0
-Copyright: BSD style
-URL: http://www.angelfire.com/me/rch/ll.html#2UTF
+Summary:       Translates char-sets and decodes MIME.
+Name:          2UTF
+Version:       1.10
+Release:       1
+Copyright:     BSD
+Group:         Utilities/Text
+URL:           http://www.angelfire.com/me/rch/ll.html#2UTF
+Source:                ftp://sunsite.unc.edu:/pub/Linux/utils/text/2UTF-1.10.tar.gz
+Patch:         2UTF-install.patch

 BuildRoot:     /tmp/%{name}-%{version}-root
 BuildRoot:     /tmp/%{name}-%{version}-root

-Group: Utilities/Text
-Source: sunsite.unc.edu:/pub/Linux/utils/text/2UTF-1.10.tar.gz
+

 %description
 %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.  

 
 %prep
 
 %prep

-%setup
-[ $RPM_BUILD_ROOT != / ] && rm -R -f $RPM_BUILD_ROOT
+%setup -q
+%patch -p0

 
 %build
 make config
 
 %build
 make config

-make GZIPDOCS=yes prefix=/usr sysconfdir=/etc docsdir=/usr/doc/2UTF \
-               var_prefix=/var OPT="$RPM_OPT_FLAGS"
+make GZIPDOCS=no \
+       PREFIX=%{_prefix} \
+       sysconfdir=/etc \
+       docsdir=%{_docdir}/%{name}-%{version} \
+       var_prefix=/var \
+       ALIASES=/var/state/2UTF.aliases \
+       charmaps_localdatadir=%{_datadir}/i18n/charmaps \
+       man1dir=%{_mandir}/man1 \
+       OPT="$RPM_OPT_FLAGS"

 
 %install
 
 %install

-make GZIPDOCS=yes prefix=$RPM_BUILD_ROOT/usr sysconfdir=$RPM_BUILD_ROOT/etc \
+rm -rf $RPM_BUILD_ROOT
+make GZIPDOCS=no \
+       PREFIX=$RPM_BUILD_ROOT/%{_prefix} \
+       sysconfdir=$RPM_BUILD_ROOT/etc \

        var_prefix=$RPM_BUILD_ROOT/var \
        var_prefix=$RPM_BUILD_ROOT/var \

-       docsdir=$RPM_BUILD_ROOT/usr/doc/2UTF \
-       tmpdir_install=yes install
-chown -R root.root     $RPM_BUILD_ROOT/
-chmod -R g-ws          $RPM_BUILD_ROOT/
-find $RPM_BUILD_ROOT -type f -or -type l \
-       |sed -e 's!^'"$RPM_BUILD_ROOT"'!!; s!/etc!%config &!' >filelist
+       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 \
+       tmpdir_install=yes \
+       owner=`id -ur` \
+       group=`id -gr` \
+       install

 
 

-%files
-%files -f filelist
-%dir /usr/doc/2UTF
-%dir /usr/doc/2UTF/examples
+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
+
+gzip -9nf $RPM_BUILD_ROOT/%{_mandir}/man1/* examples/* \
+       BSD_style_license TODO changelog copyright || :

 
 %post
 
 %post

-set -o errexit
-test -e /usr/local/share/i18n/charmaps \
-    || install -c -d -o root -g staff -m 2775  /usr/local/share/i18n/charmaps

 %{_bindir}/2UTF --create-aliases
 %{_bindir}/2UTF --create-aliases

+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc {BSD_style_license,TODO,changelog,copyright}.gz examples
+%config /etc/2UTF.config
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%{_mandir}/man1/*
+%{_datadir}/terminfo/l/*
+
+%changelog
+* Wed Jul 07 1999 Jan Rêkorajski <baggins@pld.org.pl>
+  [1.10-1]
+- FHS 2.0
+- spec cleanup